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

Icu 14778 add more sessions tests #2615

Merged
merged 3 commits into from
Dec 10, 2024
Merged

Icu 14778 add more sessions tests #2615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22ecc45
test: 💍 Add desktop sessions tests
ZedLi Dec 5, 2024
001c77d
chore: 🤖 Add support for dotenv and stop using relative paths
ZedLi Dec 6, 2024
ad95b80
refactor: 💡 Force usage of node 20
ZedLi Dec 6, 2024
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
2 changes: 2 additions & 0 deletions e2e-tests/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
admin/artifacts
desktop/artifacts
playwright-report

.auth
8 changes: 7 additions & 1 deletion e2e-tests/desktop/fixtures/electronTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ import fs from 'fs';
* @return {string}
*/
const getExecutablePath = (buildDirectory = 'out') => {
const rootDir = path.resolve('../ui/desktop/electron-app');
// Using process.cwd() can change depending on where you run the tests so we use the current file location
// __dirname isn't available in ES modules so we need to indirectly get the directory
const rootDir = path.resolve(
import.meta.dirname,
'../../../ui/desktop/electron-app',
);

// directory where the builds are stored
const outDir = path.resolve(rootDir, buildDirectory);
// list of files in the out directory
Expand Down
1 change: 0 additions & 1 deletion e2e-tests/desktop/playwright.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export default defineConfig({
workers: 1, // Tests need to be run in serial, otherwise there may be conflicts when using the CLI
use: {
baseURL: process.env.BOUNDARY_ADDR,
storageState: './admin/artifacts/authenticated-state.json',
extraHTTPHeaders: {
// This token is set in global-setup.js
Authorization: `Bearer ${process.env.E2E_TOKEN}`,
Expand Down
251 changes: 251 additions & 0 deletions e2e-tests/desktop/tests/sessions.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,251 @@
/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
*/

import { expect, test } from '../fixtures/baseTest.js';
import * as boundaryHttp from '../../helpers/boundary-http.js';

let org;
let targetWithHost;
let sshTarget;
let sshTarget2;
let credential;

test.beforeEach(
async ({ request, targetAddress, targetPort, sshUser, sshKeyPath }) => {
org = await boundaryHttp.createOrg(request);
const project = await boundaryHttp.createProject(request, org.id);

// Create host set
const hostCatalog = await boundaryHttp.createStaticHostCatalog(
request,
project.id,
);
const host = await boundaryHttp.createHost(request, {
hostCatalogId: hostCatalog.id,
address: targetAddress,
});

const hostSet = await boundaryHttp.createHostSet(request, hostCatalog.id);
await boundaryHttp.addHostToHostSet(request, {
hostSet,
hostIds: [host.id],
});

// Create a static credential store and key pair credential
const credentialStore = await boundaryHttp.createStaticCredentialStore(
request,
project.id,
);
credential = await boundaryHttp.createStaticCredentialKeyPair(request, {
credentialStoreId: credentialStore.id,
username: sshUser,
sshKeyPath,
});

// Create tcp target with host set and 1 host
targetWithHost = await boundaryHttp.createTarget(request, {
scopeId: project.id,
type: 'tcp',
port: targetPort,
});
targetWithHost = await boundaryHttp.addHostSource(request, {
target: targetWithHost,
hostSourceIds: [hostSet.id],
});
targetWithHost = await boundaryHttp.addBrokeredCredentials(request, {
target: targetWithHost,
credentialIds: [credential.id],
});

// Create SSH targets with address
sshTarget = await boundaryHttp.createTarget(request, {
scopeId: project.id,
type: 'ssh',
port: targetPort,
address: targetAddress,
});
sshTarget = await boundaryHttp.addInjectedCredentials(request, {
target: sshTarget,
credentialIds: [credential.id],
});

sshTarget2 = await boundaryHttp.createTarget(request, {
scopeId: project.id,
type: 'ssh',
port: targetPort,
address: targetAddress,
});
sshTarget2 = await boundaryHttp.addInjectedCredentials(request, {
target: sshTarget2,
credentialIds: [credential.id],
});
},
);

test.afterEach(async ({ request }) => {
if (org) {
await boundaryHttp.deleteOrg(request, org.id);
}
});

test.describe('Sessions tests', async () => {
test('Establishes two different sessions and cancels them', async ({
authedPage,
}) => {
// Connect to two targets
await authedPage
.getByRole('row', { name: sshTarget.name })
.getByRole('link', { name: 'Connect' })
.click();
await expect(
authedPage.getByRole('heading', { name: 'Sessions' }),
).toBeVisible();

await authedPage.getByRole('link', { name: 'Targets' }).click();

await authedPage
.getByRole('row', { name: targetWithHost.name })
.getByRole('link', { name: 'Connect' })
.click();
await expect(
authedPage.getByRole('heading', { name: 'Sessions' }),
).toBeVisible();

await authedPage.getByRole('link', { name: 'Sessions' }).click();

await expect(
authedPage
.getByRole('row')
.filter({ hasNot: authedPage.getByRole('columnheader') })
.getByText('Pending'),
).toHaveCount(2);

// Cancel both sessions
for (const cancel of await authedPage.getByLabel('Cancel').all()) {
await cancel.click();
}

await expect(
authedPage
.getByRole('row')
.filter({ hasNot: authedPage.getByRole('columnheader') })
.getByText('Canceling'),
).toHaveCount(2);
});
});

test.describe('Filtering sessions tests', async () => {
test.beforeEach(async ({ authedPage }) => {
// Connect to three targets
await authedPage
.getByRole('row', { name: sshTarget.name })
.getByRole('link', { name: 'Connect' })
.click();
await expect(
authedPage.getByRole('heading', { name: 'Sessions' }),
).toBeVisible();

await authedPage.getByRole('link', { name: 'Targets' }).click();

await authedPage
.getByRole('row', { name: sshTarget2.name })
.getByRole('link', { name: 'Connect' })
.click();
await expect(
authedPage.getByRole('heading', { name: 'Sessions' }),
).toBeVisible();

await authedPage.getByRole('link', { name: 'Targets' }).click();

await authedPage
.getByRole('row', { name: targetWithHost.name })
.getByRole('link', { name: 'Connect' })
.click();
await expect(
authedPage.getByRole('heading', { name: 'Sessions' }),
).toBeVisible();
await authedPage.getByRole('link', { name: 'Sessions' }).click();

await expect(
authedPage
.getByRole('row')
.filter({ hasNot: authedPage.getByRole('columnheader') })
.getByRole('cell', { name: 'Pending' }),
).toHaveCount(3);
});

test.afterEach(async ({ authedPage }) => {
await authedPage.getByRole('button', { name: 'Clear Filters' }).click();
await expect(
authedPage.getByRole('button', { name: 'Clear Filters' }),
).toBeHidden();
for (const cancel of await authedPage.getByLabel('Cancel').all()) {
await cancel.click();
}

await expect(authedPage.getByLabel('Cancel')).toHaveCount(0);
});

test('Filters by target', async ({ authedPage }) => {
await authedPage.getByRole('button', { name: 'Target' }).click();
await authedPage.getByLabel('Narrow results').fill(targetWithHost.name);
await expect(authedPage.getByRole('checkbox')).toHaveCount(1);
await authedPage.getByLabel(targetWithHost.name).check();
await authedPage.getByRole('button', { name: 'Apply' }).click();

await expect(
authedPage
.getByRole('row')
.filter({ hasNot: authedPage.getByRole('columnheader') })
.getByRole('cell', { name: 'Pending' }),
).toHaveCount(1);
await expect(
authedPage.getByRole('cell', { name: targetWithHost.name }),
).toBeVisible();
});

test('Filters by status', async ({ authedPage }) => {
await authedPage
.getByRole('row', { name: sshTarget.name })
.getByRole('link')
.first()
.click();
await authedPage.getByRole('tab', { name: 'Shell' }).click();
await authedPage.waitForTimeout(3000);
await authedPage.getByRole('link', { name: 'Sessions' }).click();

await authedPage.getByRole('button', { name: 'Clear Filters' }).click();
await expect(
authedPage.getByRole('button', { name: 'Clear Filters' }),
).toBeHidden();
await authedPage.getByRole('button', { name: 'Status' }).click();
await authedPage.getByLabel('Active').check();
await authedPage.getByRole('button', { name: 'Apply' }).click();

await expect(
authedPage
.getByRole('row')
.filter({ hasNot: authedPage.getByRole('columnheader') })
.getByRole('cell', { name: 'Active' }),
).toHaveCount(1);
await expect(
authedPage.getByRole('cell', { name: sshTarget.name }),
).toBeVisible();

await authedPage.getByRole('button', { name: 'Clear Filters' }).click();
await expect(
authedPage.getByRole('button', { name: 'Clear Filters' }),
).toBeHidden();
await authedPage.getByRole('button', { name: 'Status' }).click();
await authedPage.getByLabel('Pending').check();
await authedPage.getByRole('button', { name: 'Apply' }).click();
await expect(
authedPage
.getByRole('row')
.filter({ hasNot: authedPage.getByRole('columnheader') })
.getByRole('cell', { name: 'Pending' }),
).toHaveCount(2);
});
});
53 changes: 29 additions & 24 deletions e2e-tests/desktop/tests/targets.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import { expect, test } from '../fixtures/baseTest.js';
import * as boundaryHttp from '../../helpers/boundary-http';
import * as boundaryHttp from '../../helpers/boundary-http.js';

const hostName = 'Host name for test';
let org;
Expand All @@ -13,7 +13,7 @@ let targetWithTwoHosts;
let sshTarget;
let credential;

test.beforeAll(
test.beforeEach(
async ({ request, targetAddress, targetPort, sshUser, sshKeyPath }) => {
org = await boundaryHttp.createOrg(request);
const project = await boundaryHttp.createProject(request, org.id);
Expand Down Expand Up @@ -108,20 +108,20 @@ test.beforeAll(
},
);

test.afterAll(async ({ request }) => {
test.afterEach(async ({ request }) => {
if (org) {
await boundaryHttp.deleteOrg(request, org.id);
}
});

test.describe('Targets test', async () => {
test.describe('Targets tests', async () => {
test('Connects to a tcp target with one host', async ({ authedPage }) => {
await authedPage.getByRole('link', { name: targetWithHost.name }).click();
await authedPage.getByRole('button', { name: 'Connect' }).click();

await expect(authedPage).toHaveURL(
/.*\/scopes\/global\/projects\/sessions/,
);
await expect(
authedPage.getByRole('heading', { name: 'Sessions' }),
).toBeVisible();

await expect(authedPage.getByText(credential.name)).toBeVisible();
await expect(authedPage.getByText('username')).toBeVisible();
Expand Down Expand Up @@ -153,9 +153,9 @@ test.describe('Targets test', async () => {

await authedPage.getByRole('button', { name: 'End Session' }).click();
await expect(authedPage.getByText('Canceled successfully.')).toBeVisible();
await expect(authedPage).toHaveURL(
/.*\/scopes\/global\/projects\/targets$/,
);
await expect(
authedPage.getByRole('heading', { name: 'Targets' }),
).toBeVisible();
});

[{ host: 'Quick Connect' }, { host: hostName }].forEach(({ host }) => {
Expand All @@ -167,14 +167,15 @@ test.describe('Targets test', async () => {
.click();
await authedPage.getByRole('button', { name: 'Connect' }).click();

await expect(authedPage).toHaveURL(
/.*\/scopes\/global\/projects\/targets/,
);
await expect(
authedPage.getByRole('heading', { name: 'Choose a Host' }),
).toBeVisible();

await authedPage.getByRole('button', { name: host }).click();

await expect(authedPage).toHaveURL(
/.*\/scopes\/global\/projects\/sessions/,
);
await expect(
authedPage.getByRole('heading', { name: 'Sessions' }),
).toBeVisible();

await expect(authedPage.getByText(credential.name)).toBeVisible();
await expect(authedPage.getByText('username')).toBeVisible();
Expand Down Expand Up @@ -218,26 +219,30 @@ test.describe('Targets test', async () => {
await authedPage.getByRole('link', { name: sshTarget.name }).click();
await authedPage.getByRole('button', { name: 'Connect' }).click();

await expect(authedPage).toHaveURL(
/.*\/scopes\/global\/projects\/sessions/,
);
await expect(
authedPage.getByRole('heading', { name: 'Sessions' }),
).toBeVisible();

await authedPage.getByRole('tab', { name: 'Shell' }).click();
// TODO: Research a better way to test canvas elements for the shell,
// would it be too brittle to assert a snapshot of an expected image?

await authedPage.getByRole('button', { name: 'End Session' }).click();
await expect(authedPage.getByText('Canceled successfully.')).toBeVisible();
await expect(authedPage).toHaveURL(
/.*\/scopes\/global\/projects\/targets$/,
);

await expect(
authedPage.getByRole('heading', { name: 'Targets' }),
).toBeVisible();
});

test('Searches targets correctly', async ({ authedPage }) => {
await authedPage.getByLabel('Search').fill(targetWithHost.name);

// One row is the header
await expect(authedPage.getByRole('row')).toHaveCount(2);
await expect(
authedPage
.getByRole('row')
.filter({ hasNot: authedPage.getByRole('columnheader') }),
).toHaveCount(1);
await expect(
authedPage.getByRole('link', { name: targetWithHost.name }),
).toBeVisible();
Expand Down
Loading
Loading