Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#5362 add tasks #5498

Merged
merged 1 commit into from
Apr 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public class ProgressPage extends WebPage {
@JProgress(root = "#circularIndeterminateProgress")
public static CircularProgress circularProgressIndeterminate;

// @todo #5297 Check locators with aria-valuenow, very stange to use them
@JProgress(root = "div[aria-valuenow='25'][1]")
public static CircularProgress circularProgressDeterminateWithValue25;

Expand All @@ -26,7 +25,7 @@ public class ProgressPage extends WebPage {
@JProgress(root = "div[aria-valuenow='100'][1]")
public static CircularProgress circularProgressDeterminateWithValue100;

@JProgress(root = "div[aria-valuenow='100'] ~ div[1]")
@JProgress(root = "div[role='progressbar'][6]")
public static CircularProgress circularProgressDeterminate;

@JProgress(root = "div[role='progressbar'][7]")
Expand All @@ -44,10 +43,13 @@ public class ProgressPage extends WebPage {
@JProgress(root = "button.MuiButton-containedPrimary ~ div")
public static CircularProgress acceptTermsCircularProgress;

// @todo #5340 Label is not a part of CurcularProgress, should be removed
@JProgress(root = "(//h2[text()='Circular with label']/following::div[@role='progressbar'])[1]",
label = "div.MuiTypography-caption")
public static CircularProgress circularProgressWithLabel;

// @todo #5340 there is no first and second, there is a buffer and main progress,
// should be renamed
@JProgress(root = "(//h2[text()='Linear indeterminate']/following::div)[2]",
firstBar = ".MuiLinearProgress-bar1Indeterminate",
secondBar = ".MuiLinearProgress-bar2Indeterminate")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,9 @@ public void circularDeterminateTest() {

circularProgressDeterminate.is().displayed().and().determinate();
int valueNow = circularProgressDeterminate.getValueNow();
timer.wait(() -> circularProgressDeterminate.has().value(valueNow + 10));
timer.wait(() -> circularProgressDeterminate.has().value((valueNow + 10) % 100));

circularProgressDeterminateIndeterminate.is().displayed().and().indeterminate();
circularProgressDeterminateIndeterminate.circle()
.has().cssClass("MuiCircularProgress-circleDisableShrink");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

// @todo #5340 Check if this annotaion is needed
/**
* Annotation for setting custom locators for progress and its components.
*
Expand Down
Loading