Skip to content

Commit 59c756c

Browse files
authored
[plugin-web-app-playwright] Reset context before any page navigation (#4609)
1 parent c09e3de commit 59c756c

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

vividus-plugin-web-app-playwright/src/main/java/org/vividus/ui/web/playwright/steps/PageSteps.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public void openMainApplicationPage()
6565
@Given("I am on page with URL `$pageUrl`")
6666
public void openPage(String pageUrl)
6767
{
68+
uiContext.reset();
6869
Optional.ofNullable(uiContext.getCurrentPage()).orElseGet(this::openNewTab).navigate(pageUrl);
6970
}
7071

@@ -74,6 +75,7 @@ public void openPage(String pageUrl)
7475
@When("I refresh page")
7576
public void refreshPage()
7677
{
78+
uiContext.reset();
7779
uiContext.getCurrentPage().reload();
7880
}
7981

@@ -83,6 +85,7 @@ public void refreshPage()
8385
@When("I navigate back")
8486
public void navigateBack()
8587
{
88+
uiContext.reset();
8689
uiContext.getCurrentPage().goBack();
8790
}
8891

vividus-plugin-web-app-playwright/src/test/java/org/vividus/ui/web/playwright/steps/PageStepsTests.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ void shouldOpenMainApplicationPage()
6060

6161
pageSteps.openMainApplicationPage();
6262

63-
verify(page).navigate(PAGE_URL);
63+
var ordered = inOrder(uiContext, page);
64+
ordered.verify(uiContext).reset();
65+
ordered.verify(page).navigate(PAGE_URL);
6466
}
6567

6668
@Test
@@ -71,7 +73,9 @@ void shouldOpenPageInCurrentTab()
7173

7274
pageSteps.openPage(PAGE_URL);
7375

74-
verify(page).navigate(PAGE_URL);
76+
var ordered = inOrder(uiContext, page);
77+
ordered.verify(uiContext).reset();
78+
ordered.verify(page).navigate(PAGE_URL);
7579
}
7680

7781
@Test
@@ -86,6 +90,7 @@ void shouldOpenPageInNewTab()
8690
pageSteps.openPage(PAGE_URL);
8791

8892
var ordered = inOrder(uiContext, page);
93+
ordered.verify(uiContext).reset();
8994
ordered.verify(uiContext).setCurrentPage(page);
9095
ordered.verify(page).navigate(PAGE_URL);
9196
}
@@ -98,7 +103,9 @@ void shouldRefreshPage()
98103

99104
pageSteps.refreshPage();
100105

101-
verify(page).reload();
106+
var ordered = inOrder(uiContext, page);
107+
ordered.verify(uiContext).reset();
108+
ordered.verify(page).reload();
102109
}
103110

104111
@Test
@@ -109,7 +116,9 @@ void shouldNavigateBack()
109116

110117
pageSteps.navigateBack();
111118

112-
verify(page).goBack();
119+
var ordered = inOrder(uiContext, page);
120+
ordered.verify(uiContext).reset();
121+
ordered.verify(page).goBack();
113122
}
114123

115124
@Test
@@ -121,7 +130,9 @@ void shouldOpenRelativeUrl()
121130

122131
pageSteps.openRelativeUrl("stats");
123132

124-
verify(uiContext.getCurrentPage()).navigate("https://example.com/path/stats");
133+
var ordered = inOrder(uiContext, page);
134+
ordered.verify(uiContext).reset();
135+
ordered.verify(uiContext.getCurrentPage()).navigate("https://example.com/path/stats");
125136
}
126137

127138
@Test

0 commit comments

Comments
 (0)