Skip to content

Improve stability of cancel tests #881

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.

Sign up for GitHub

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

Merged
timja merged 2 commits into from
Jul 7, 2025
Merged

Improve stability of cancel tests #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16d9f31
Wait for dialog to be hidden before continuing
lewisbirks Jul 7, 2025
951005e
mvn spotless:apply
timja Jul 7, 2025
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
20 changes: 7 additions & 13 deletions src/test/java/io/jenkins/plugins/pipelinegraphview/PipelineGraphViewCancelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package io.jenkins.plugins.pipelinegraphview;

import static org.junit.jupiter.api.Assertions.assertTrue;
import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;

import com.microsoft.playwright.Locator;
import com.microsoft.playwright.Locator.WaitForOptions;
import com.microsoft.playwright.Page;
import com.microsoft.playwright.junit.UsePlaywright;
import com.microsoft.playwright.options.AriaRole;
import com.microsoft.playwright.options.WaitForSelectorState;
import hudson.model.Result;
import io.jenkins.plugins.casc.misc.ConfiguredWithCode;
import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule;
Expand Down Expand Up @@ -37,17 +35,15 @@ void cancelButtonCancelsBuild(Page p, JenkinsConfiguredWithCodeRule j) throws Ex
.goToBuild()
.goToPipelineOverview();

assertTrue(p.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Cancel"))
.isVisible());
Locator cancelLocator = p.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Cancel"));
assertThat(cancelLocator).isVisible();
Copy link
Member

@timja timja Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There doesn't seem to be any waiting here, (except the one wait for hidden that is removed), could you explain this a bit? the isVisible and isHidden checks you've added won't wait for them to be true as far as I can tell?

Copy link
Contributor Author

@lewisbirks lewisbirks Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From what I remember in the docs, the assertions retry/wait automatically. I'll double check tomorrow though

Copy link
Member

@timja timja Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, Time to retry the assertion for in milliseconds. Defaults to 5000.


op.cancel();

SemaphoreStep.success("wait/1", null);
j.assertBuildStatus(Result.ABORTED, j.waitForCompletion(run));

Locator cancelLocator = p.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Cancel"));
cancelLocator.waitFor(new WaitForOptions().setState(WaitForSelectorState.HIDDEN));
assertTrue(cancelLocator.isHidden());
assertThat(cancelLocator).isHidden();
}

@Test
Expand All @@ -63,14 +59,12 @@ void cancelButtonDisappears(Page p, JenkinsConfiguredWithCodeRule j) throws Exce
.goToBuild()
.goToPipelineOverview();

assertTrue(p.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Cancel"))
.isVisible());
Locator cancelLocator = p.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Cancel"));
assertThat(cancelLocator).isVisible();

SemaphoreStep.success("wait/1", null);
j.assertBuildStatus(Result.SUCCESS, j.waitForCompletion(run));

Locator cancelLocator = p.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Cancel"));
cancelLocator.waitFor(new WaitForOptions().setState(WaitForSelectorState.HIDDEN));
assertTrue(cancelLocator.isHidden());
assertThat(cancelLocator).isHidden();
}
}
6 changes: 4 additions & 2 deletions src/test/java/io/jenkins/plugins/pipelinegraphview/playwright/PipelineOverviewPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,11 @@ public PipelineOverviewPage configure() {
}

public PipelineOverviewPage cancel() {
page.click("#pgv-cancel");
page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Yes"))
page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Cancel"))
.click();
Locator dialog = page.getByRole(AriaRole.DIALOG);
dialog.getByText("Yes").click();
assertThat(dialog).isHidden();
return this;
}

Expand Down