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.

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

staging alignment #4122

Merged
merged 4 commits into from
Oct 27, 2023
Merged

staging alignment #4122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c9c2cc
chore: Bump browserify-sign from 4.2.1 to 4.2.2
dependabot[bot] Oct 27, 2023
1afeac1
chore(e2e-tests): various improvements to test execution
mzedel Oct 17, 2023
b9a197a
Merge pull request #4113 from mzedel/fix/staging-tests
mzedel Oct 27, 2023
4aad666
Merge pull request #4121 from mendersoftware/dependabot/npm_and_yarn/…
mzedel Oct 27, 2023
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
33 changes: 18 additions & 15 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified tests/e2e_tests/fixtures/terminalContent-webkit.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tests/e2e_tests/integration/01-login.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ test.describe('Login', () => {
await isLoggedIn(page);
let loginVisible = await page.getByRole('button', { name: /log in/i }).isVisible();
expect(loginVisible).toBeFalsy();
await page.getByText('Help & support').click();
await page.getByText(/Releases/i).click();
const cookies = await context.cookies();
await context.storageState({ path: 'storage.json' });

Expand Down
10 changes: 5 additions & 5 deletions tests/e2e_tests/integration/02-layoutAssertions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ test.describe('Layout assertions', () => {
await page.click(`.leftNav :text('Devices')`);
let hasAcceptedDevice = false;
try {
hasAcceptedDevice = await page.isVisible('.deviceListItem');
hasAcceptedDevice = await page.isVisible(selectors.deviceListItem);
} catch (e) {
console.log(`no accepted device present so far`);
}
Expand All @@ -55,10 +55,10 @@ test.describe('Layout assertions', () => {
}
await page.locator(`input:near(:text("Status:"))`).first().click({ force: true });
await page.click(`css=.MuiPaper-root >> text=/Accepted/i`);
await page.waitForSelector(`css=.deviceListItem >> text=/original/`, { timeout: timeouts.sixtySeconds });
const element = await page.textContent('.deviceListItem');
await page.waitForSelector(`css=${selectors.deviceListItem} >> text=/original/`, { timeout: timeouts.sixtySeconds });
const element = await page.textContent(selectors.deviceListItem);
expect(element.includes('original')).toBeTruthy();
await page.click(`.deviceListItem div:last-child`);
await page.click(`${selectors.deviceListItem} div:last-child`);
await page.waitForSelector(`text=/Device information for/i`);
expect(await page.isVisible('text=Authentication status')).toBeTruthy();
});
Expand All @@ -78,6 +78,6 @@ test.describe('Layout assertions', () => {
await page.click(`.grouplist:has-text('All devices')`);
await page.click(selectors.deviceListCheckbox);
await page.click(`.grouplist:has-text('testgroup')`);
expect(await page.locator(`css=.deviceListItem >> text=/original/`)).toBeVisible();
expect(await page.locator(`css=${selectors.deviceListItem} >> text=/original/`)).toBeVisible();
});
});
39 changes: 28 additions & 11 deletions tests/e2e_tests/integration/03-files.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ test.describe('Files', () => {
await page.click(`.leftNav :text('Releases')`);
await page.getByText(/demo-artifact/i).click();
expect(await page.getByRole('heading', { name: /Release notes/i }).isVisible()).toBeTruthy();
const hasNotes = await page.getByText('foo notes').isVisible();
if (hasNotes) {
return;
}
// layout based locators are not an option here, since the edit button is also visible on the nearby tags section
// and the selector would get confused due to the proximity - so instead we loop over all the divs
await page
Expand All @@ -54,7 +58,7 @@ test.describe('Files', () => {
await input.fill('foo notes');
await page.getByTestId('CheckIcon').click();
expect(input).not.toBeVisible();
expect(await page.getByText('foo notes').isVisible()).toBeTruthy();
expect(hasNotes).toBeTruthy();
});

test('allows release tags manipulation', async ({ baseUrl, loggedInPage: page }) => {
Expand All @@ -75,8 +79,10 @@ test.describe('Files', () => {
const input = await page.getByPlaceholder(/enter release tags/i);
await input.fill('some,tags');
await page.getByTestId('CheckIcon').click();
await page.waitForTimeout(timeouts.oneSecond);
expect(input).not.toBeVisible();
await page.goto(`${baseUrl}ui/releases`);
await page.waitForSelector('text="some, tags"', { timeout: timeouts.oneSecond });
expect(await page.getByText('some, tags').isVisible()).toBeTruthy();
});

Expand All @@ -91,30 +97,41 @@ test.describe('Files', () => {
await editButton.click();
const alreadyTagged = await page.getByRole('button', { name: 'some' }).isVisible();
if (alreadyTagged) {
await page.getByRole('button', { name: 'some' }).getByTestId('CancelIcon').click();
await page.getByRole('button', { name: 'tags' }).getByTestId('CancelIcon').click();
await Promise.all(
['some', 'tags'].map(async name => {
const foundTag = await page.getByRole('button', { name });
if (!(await foundTag.isVisible())) {
return Promise.resolve();
}
return await foundTag.getByTestId('CancelIcon').click();
})
);
await page.getByTestId('CheckIcon').click();
expect(await page.getByText('add release tags').isVisible()).toBeTruthy();
// await page.waitForTimeout(timeouts.oneSecond);
expect(await page.getByPlaceholder(/add release tags/i).isVisible({ timeout: timeouts.oneSecond })).toBeTruthy();
await editButton.click();
}
await page.getByPlaceholder(/enter release tags/i).fill(releaseTag);
await page.getByTestId('CheckIcon').click();
await page.press('body', 'Escape');
expect(await page.getByText(releaseTag).isVisible()).toBeTruthy();
await page.waitForSelector('text=Upload', { timeout: timeouts.oneSecond });
await page.press('body', 'Escape');
expect(await page.getByText(releaseTag, { exact: false }).isVisible({ timeout: timeouts.oneSecond })).toBeTruthy();
});

test('allows release tags filtering', async ({ loggedInPage: page }) => {
await page.click(`.leftNav :text('Releases')`);
expect(await page.getByText(releaseTag.toLowerCase()).isVisible()).toBeTruthy();
await page.getByPlaceholder(/select tags/i).fill('foo,');
await page.waitForTimeout(timeouts.oneSecond);
expect(await page.getByText(/There are no Releases/i).isVisible()).toBeTruthy();
const releasesNote = await page.getByText(/There are no Releases*/i);
releasesNote.waitFor({ timeout: timeouts.default });
await page.getByText(/mender-demo-artifact*/i).waitFor({ timeout: timeouts.default, state: 'detached' });
await page.getByText(/Clear filter/i).click();
await page.waitForTimeout(timeouts.oneSecond);
await page.waitForSelector('text=/mender-demo-artifact*/i');
expect(await page.getByText(releaseTag.toLowerCase()).isVisible()).toBeTruthy();
await page.getByPlaceholder(/select tags/i).fill(`${releaseTag.toLowerCase()},`);
await page.waitForTimeout(timeouts.oneSecond);
expect(await page.getByText(/There are no Releases/i).isVisible()).not.toBeTruthy();
await page.getByText(/mender-demo-artifact*/i).waitFor({ timeout: timeouts.default });
expect(await releasesNote.isVisible()).toBeFalsy();
});

// test('allows uploading custom file creations', () => {
Expand Down Expand Up @@ -156,7 +173,7 @@ test.describe('Files', () => {
// TODO adjust test to better work with webkit, for now it should be good enough to assume file transfers work there too if the remote terminal works
test.skip(!['enterprise', 'staging'].includes(environment) || ['webkit'].includes(browserName));
await page.click(`.leftNav :text('Devices')`);
await page.click(`.deviceListItem div:last-child`);
await page.click(`${selectors.deviceListItem} div:last-child`);
await page.click(`text=/troubleshooting/i`);
// the deviceconnect connection might not be established right away
await page.waitForSelector('text=/Session status/i', { timeout: timeouts.tenSeconds });
Expand Down
26 changes: 14 additions & 12 deletions tests/e2e_tests/integration/04-deployments.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,15 @@ test.describe('Deployments', () => {
await page.click('.MuiSpeedDial-fab');
await page.click('[aria-label="deploy"]');
await page.waitForSelector(selectors.deviceGroupSelect, { timeout: timeouts.fiveSeconds });
await page.focus(selectors.deviceGroupSelect);
await page.getByPlaceholder(/select a device group/i).fill('All');
const deviceGroupSelect = await page.getByPlaceholder(/select a device group/i);
await deviceGroupSelect.focus();
await deviceGroupSelect.fill('All');
await page.click(`#deployment-device-group-selection-listbox li:has-text('All devices')`);
const creationButton = await page.waitForSelector(selectors.deploymentCreation);
const creationButton = await page.getByRole('button', { name: /create deployment/i });
await creationButton.scrollIntoViewIfNeeded();
await creationButton.click();
await page.waitForSelector(selectors.deploymentListItem, { timeout: timeouts.tenSeconds });
await page.click(`[role="tab"]:has-text('Finished')`);
await page.getByRole('tab', { name: /finished/i }).click();
await page.waitForSelector(selectors.deploymentListItemContent, { timeout: timeouts.sixtySeconds });
const datetime = await page.getAttribute(`${selectors.deploymentListItemContent} time`, 'datetime');
const time = dayjs(datetime);
Expand All @@ -58,7 +59,7 @@ test.describe('Deployments', () => {
await page.click('.MuiSpeedDial-fab');
await page.click('[aria-label="create-deployment"]');
await page.waitForSelector(selectors.releaseSelect, { timeout: timeouts.fiveSeconds });
const releaseSelect = await page.locator(selectors.releaseSelect);
const releaseSelect = await page.getByPlaceholder(/select a release/i);
await releaseSelect.focus();
await releaseSelect.fill('mender-demo');
await page.click(`#deployment-release-selection-listbox li`);
Expand All @@ -68,11 +69,11 @@ test.describe('Deployments', () => {
await releaseSelect.focus();
await releaseSelect.fill('mender-demo');
await page.click(`#deployment-release-selection-listbox li`);
const creationButton = await page.waitForSelector(selectors.deploymentCreation);
const creationButton = await page.getByRole('button', { name: /create deployment/i });
await creationButton.scrollIntoViewIfNeeded();
await creationButton.click();
await page.waitForSelector(selectors.deploymentListItem, { timeout: timeouts.tenSeconds });
await page.click(`[role="tab"]:has-text('Finished')`);
await expect(page.getByText(/Select a Release to deploy/i)).toHaveCount(0, { timeout: timeouts.tenSeconds });
await page.getByRole('tab', { name: /finished/i }).click();
await page.waitForSelector(selectors.deploymentListItemContent, { timeout: timeouts.sixtySeconds });
const datetime = await page.getAttribute(`${selectors.deploymentListItemContent} time`, 'datetime');
const time = dayjs(datetime);
Expand All @@ -86,21 +87,22 @@ test.describe('Deployments', () => {
await page.click(`button:has-text('Create a deployment')`);

await page.waitForSelector(selectors.releaseSelect, { timeout: timeouts.fiveSeconds });
const releaseSelect = await page.locator(selectors.releaseSelect);
const releaseSelect = await page.getByPlaceholder(/select a release/i);
await releaseSelect.focus();
await releaseSelect.fill('mender');
await page.click(`#deployment-release-selection-listbox li:has-text('mender-demo-artifact')`);

await page.waitForSelector(selectors.deviceGroupSelect, { timeout: timeouts.fiveSeconds });
const deviceGroupSelect = await page.locator(selectors.deviceGroupSelect);
const deviceGroupSelect = await page.getByPlaceholder(/select a device group/i);
await deviceGroupSelect.focus();
await deviceGroupSelect.fill('test');
await page.click(`#deployment-device-group-selection-listbox li:has-text('testgroup')`);
const creationButton = await page.waitForSelector(selectors.deploymentCreation);
const creationButton = await page.getByRole('button', { name: /create deployment/i });
await creationButton.scrollIntoViewIfNeeded();
await creationButton.click();
await expect(page.getByText(/Select a Release to deploy/i)).toHaveCount(0, { timeout: timeouts.tenSeconds });
await page.waitForSelector(selectors.deploymentListItem, { timeout: timeouts.tenSeconds });
await page.click(`[role="tab"]:has-text('Finished')`);
await page.getByRole('tab', { name: /finished/i }).click();
await page.waitForSelector(selectors.deploymentListItemContent, { timeout: timeouts.sixtySeconds });
});
});
41 changes: 26 additions & 15 deletions tests/e2e_tests/integration/05-deviceDetails.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ test.describe('Device details', () => {

test('has basic inventory', async ({ demoDeviceName, loggedInPage: page }) => {
await page.click(`.leftNav :text('Devices')`);
await page.click(`.deviceListItem div:last-child`);
await page.click(`${selectors.deviceListItem} div:last-child`);
await page.click(`text=/inventory/i`);
expect(await page.isVisible(`css=.expandedDevice >> text=Linux`)).toBeTruthy();
expect(await page.isVisible(`css=.expandedDevice >> text=mac`)).toBeTruthy();
Expand All @@ -39,11 +39,11 @@ test.describe('Device details', () => {
test('can be found', async ({ demoDeviceName, loggedInPage: page }) => {
const searchField = await page.getByPlaceholder(/search devices/i);
await searchField.fill(demoDeviceName);
await page.waitForSelector('.deviceListItem');
await page.waitForSelector(selectors.deviceListItem);
const slideOut = await page.locator('.MuiPaper-root');
expect(await slideOut.locator(`:text("${demoDeviceName}"):below(:text("clear search"))`).isVisible()).toBeTruthy();
expect(await slideOut.getByText('1-1 of 1').isVisible()).toBeTruthy();
await page.click(`.deviceListItem`);
await page.click(selectors.deviceListItem);
await page.waitForSelector('text=/device information/i');
expect(await page.getByText(/Authorization sets/i).isVisible()).toBeTruthy();
await page.click('[aria-label="close"]');
Expand All @@ -53,31 +53,42 @@ test.describe('Device details', () => {
expect(await page.getByText(/device found/i).isVisible()).toBeTruthy();
});

test('can be filtered', async ({ demoDeviceName, environment, loggedInPage: page }) => {
test('can be filtered', async ({ browserName, demoDeviceName, loggedInPage: page }) => {
test.setTimeout(2 * timeouts.fifteenSeconds);
await page.click(`.leftNav :text('Devices')`);
await page.getByRole('button', { name: /filters/i }).click();
await page.getByLabel(/attribute/i).fill(rootfs);
const nameInput = await page.getByLabel(/value/i);
await nameInput.fill(demoDeviceName);
await page.waitForTimeout(timeouts.oneSecond);
await nameInput.press('Enter');
expect(await page.getByRole('button', { name: `${rootfs} = ${demoDeviceName}` }).isVisible()).toBeTruthy();
await page.waitForSelector('.deviceListItem');
expect(await page.getByText('1-1 of 1').isVisible()).toBeTruthy();
await page.getByText(/clear filter/i).click();
if (['enterprise', 'staging'].includes(environment)) {
await page.getByLabel(/attribute/i).fill(rootfs);
await page.getByText(/equals/i).click();
await page.getByText(`doesn't exist`).click();
if (browserName === 'webkit') {
await page.waitForTimeout(timeouts.fiveSeconds);
expect(await page.getByRole('button', { name: `${rootfs} doesn't exist` }).isVisible()).toBeTruthy();
expect(await page.getByText('No devices found').isVisible()).toBeTruthy();
}
expect(await page.getByRole('button', { name: `${rootfs} = ${demoDeviceName}` }).isVisible({ timeout: timeouts.default })).toBeTruthy();
await page.waitForSelector(selectors.deviceListItem);
});

test('can be filtered into non-existence', async ({ environment, loggedInPage: page }) => {
test.skip(!['enterprise', 'staging'].includes(environment), 'not available in OS');
test.setTimeout(2 * timeouts.fifteenSeconds);
await page.click(`.leftNav :text('Devices')`);
await page.getByRole('button', { name: /filters/i }).click();
await page.getByLabel(/attribute/i).fill(rootfs);
await page.getByText(/equals/i).click();
await page.getByText(`doesn't exist`).click();
await page.waitForTimeout(timeouts.fiveSeconds);
expect(await page.getByRole('button', { name: `${rootfs} doesn't exist` }).isVisible()).toBeTruthy();
expect(await page.getByText('No devices found').isVisible()).toBeTruthy();
await page.getByText(/clear filter/i).click();
await page.waitForSelector(selectors.deviceListItem);
const paginationVisible = await page.getByText('1-1').isVisible({ timeout: timeouts.default });
expect(paginationVisible).toBeTruthy();
});

test('can open a terminal', async ({ browserName, loggedInPage: page }) => {
await page.click(`.leftNav :text('Devices')`);
await page.click(`.deviceListItem div:last-child`);
await page.click(`${selectors.deviceListItem} div:last-child`);
await page.click(`text=/troubleshooting/i`);
// the deviceconnect connection might not be established right away
await page.waitForSelector('text=/Session status/i', { timeout: timeouts.tenSeconds });
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e_tests/integration/06-auditlogs.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ test.describe('Auditlogs', () => {
test('will track remote terminal sessions', async ({ environment, loggedInPage: page }) => {
test.skip(!['enterprise', 'staging'].includes(environment));
await page.click(`.leftNav :text('Devices')`);
await page.click(`.deviceListItem div:last-child`);
await page.click(`${selectors.deviceListItem} div:last-child`);
await page.click(`text=/troubleshooting/i`);
// the deviceconnect connection might not be established right away
await page.waitForSelector('text=/Session status/i', { timeout: timeouts.tenSeconds });
Expand Down
Loading