Skip to content

Commit 6fe1ebc

Browse files
committed
fix releases demo tests
1 parent 3fe3e08 commit 6fe1ebc

File tree

3 files changed

+23
-22
lines changed

3 files changed

+23
-22
lines changed

scripts/pit/its/releases.js

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { expect} = require('@playwright/test');
2-
const {log, args, createPage, closePage, takeScreenshot, waitForServerReady} = require('./test-utils');
2+
const {log, args, createPage, closePage, takeScreenshot, waitForServerReady, dismissDevmode} = require('./test-utils');
33

44
(async () => {
55
const arg = args();
@@ -10,37 +10,36 @@ const {log, args, createPage, closePage, takeScreenshot, waitForServerReady} = r
1010

1111
await page.locator('html').first().innerHTML();
1212
await takeScreenshot(page, __filename, 'view1-loaded');
13+
14+
if (await dismissDevmode(page)) {
15+
await takeScreenshot(page, __filename, `dev-mode-indicator-closed`);
16+
}
17+
1318
await expect(page.getByText('Pre-releases per version').first()).toBeVisible();
1419

1520
await page.getByText('by release count').click();
1621

1722
await takeScreenshot(page, __filename, 'view3-loaded');
1823
await expect(page.getByText('Releases per version').first()).toBeVisible();
1924

25+
const [major, minor] = arg.version.split('.');
26+
const labelRegex = new RegExp(`${major}\\.${minor}, `);
27+
await page.getByLabel(labelRegex).click();
2028

21-
if (arg.version !== 'current' ) {
22-
const [major, minor] = arg.version.split('.');
23-
const labelRegex = new RegExp(`${major}\\.${minor}, `);
24-
await page.getByLabel(labelRegex).click();
25-
26-
await takeScreenshot(page, __filename, `element-${labelRegex}-clicked`);
27-
const selector = `path.highcharts-point[aria-label*="${arg.version}"]`
28-
await expect(page.getByLabel('Interactive chart').locator(selector)).toBeVisible();
29-
await takeScreenshot(page, __filename, `interactive-chart-${arg.version}-loaded`);
30-
31-
if (arg.mode == 'dev') {
32-
try {
33-
await page.getByText('Dismiss').click({timeout: 500});
34-
await takeScreenshot(page, __filename, `dev-mode-indicator-closed`);
35-
} catch (e) {
36-
log('No dev mode indicator');
37-
}
38-
}
29+
await takeScreenshot(page, __filename, `element-${labelRegex}-clicked`);
30+
let selector = `path.highcharts-point[aria-label*="${arg.version}"]`
31+
await expect(page.getByLabel('Interactive chart').locator(selector)).toBeVisible();
32+
await takeScreenshot(page, __filename, `interactive-chart-${arg.version}-loaded`);
3933

34+
if (await page.getByText(arg.version).first().isEnabled()) {
35+
await page.getByText(arg.version).first().click();
36+
} else if (await page.locator(`${arg.version}, 1.`).isEnabled()) {
37+
await page.locator(`${arg.version}, 1.`).isEnabled();
38+
} else if (await page.locator(selector).first().isEnabled()) {
4039
await page.locator(selector).first().click();
41-
await expect(page.getByRole('heading', { name: `Release Notes for ${arg.version}` })).toBeVisible();
42-
await takeScreenshot(page, __filename, `release-notes-${arg.version}-loaded`);
4340
}
41+
await expect(page.getByRole('heading', { name: `Release Notes for ${arg.version}` })).toBeVisible();
42+
await takeScreenshot(page, __filename, `release-notes-${arg.version}-loaded`);
4443

4544
log(JSON.stringify(arg));
4645
await closePage(page);

scripts/pit/its/test-utils.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,9 @@ async function dismissDevmode(page) {
159159
}
160160
if (await dismiss.count()) {
161161
dismiss.click()
162+
return true;
162163
}
164+
return false;
163165
}
164166

165167
module.exports = {

scripts/pit/lib/lib-validate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ runValidations() {
114114
fi
115115

116116
# 12
117-
[ -z "$TEST" ] && bold "----> The version $version of '$name' app was successfully built and tested in $mode mode."
117+
[ -z "$TEST" ] && bold "----> The version $version of '$name' app was successfully built and tested in $mode mode." && printnl
118118
[ -n "$TEST" ] || (killAll && sleep 5)
119119

120120
# 13

0 commit comments

Comments
 (0)