Skip to content

Commit 870cf1e

Browse files
committed
wait for selector in waitForServerReady, for fixing wildfly
1 parent 025ba69 commit 870cf1e

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

scripts/pit/its/hello.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@ const { log, args, createPage, closePage, takeScreenshot, waitForServerReady, di
55

66
const page = await createPage(arg.headless);
77

8-
await waitForServerReady(page, arg.url);
8+
// Wait for server and vaadin ready
9+
await waitForServerReady(page, arg.url, {selector: '#outlet > * > *:not(style):not(script)'});
910

1011
// Dismiss dev mode notification if present
1112
await dismissDevmode(page);
1213

1314
const text = 'Greet';
1415

15-
// Wait for vaadin ready
16-
await page.waitForSelector('#outlet > * > *:not(style):not(script)');
17-
1816
await takeScreenshot(page, __filename, 'initial-view');
1917

2018
// Click input[type="text"]

scripts/pit/its/test-utils.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ function getCallingTestFile() {
173173
// Wait for the server to be ready and to get a valid response
174174
async function waitForServerReady(page, url, options = {}) {
175175
const {
176+
selector,
176177
maxRetries = 35, // Max number of retries
177178
retryInterval = 5000 // Interval between retries in milliseconds
178179
} = options;
@@ -184,10 +185,15 @@ async function waitForServerReady(page, url, options = {}) {
184185
const response = await page.goto(url, {timeout: 5000});
185186
// Check if the response status is not 503
186187
if (response && response.status() < 400) {
187-
await page.waitForTimeout(1000);
188-
ok(` ✓ Attempt ${attempt} Server is ready and returned a valid response. ${response.status()}\n`);
189-
await takeScreenshot(page, getCallingTestFile(), 'ss', '_before');
190-
return response;
188+
try {
189+
await page.waitForSelector(selector, {timeout: 1000});
190+
await page.waitForTimeout(1000);
191+
ok(` ✓ Attempt ${attempt} Server is ready and returned a valid response. ${response.status()}\n`);
192+
await takeScreenshot(page, getCallingTestFile(), 'ss', '_before');
193+
return response;
194+
} catch (error) {
195+
out(` ⏲ Attempt ${attempt} Server is not ready yet. ${error}\n`);
196+
}
191197
} else {
192198
out(` ⏲ Attempt ${attempt} Server is not ready yet. ${response.status()}\n`);
193199
}

0 commit comments

Comments
 (0)