@appsemble/e2e 0.35.11-test.4 → 0.35.14

package/README.md

@@ -1,8 +1,8 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.35.11-test.4/config/assets/logo.svg) Appsemble End 2 End Tests
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.35.14/config/assets/logo.svg) Appsemble End 2 End Tests
 
 > Run end 2 end tests on an Appsemble environment and provide Appsemble fixtures
 
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.35.11-test.4/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.35.11-test.4)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.35.14/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.35.14)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -38,6 +38,15 @@ test('should navigate to app', async ({ visitApp }) => {
 });
 ```
 
+## Development
+
+This package depends on other packages in the Appsemble monorepo. To make sure all tests run
+normally, go to each Appsemble dependency and run the following command:
+
+```sh
+npm run prepack
+```
+
 ## Appsemble end-to-end tests
 
 To run end to end tests, run:
@@ -58,9 +67,6 @@ during the test as if you ran it using `ui mode`.
 
 The end to end tests use the following environment variables:
 
-- `BOT_ACCOUNT_EMAIL` — The email address used to login.
-- `BOT_ACCOUNT_PASSWORD` — The password used to login.
-- `ACCESS_TOKEN` — The access token of the account that's logged in.
 - `CI` — Whether the tests are run in CI.
 - `CI_MERGE_REQUEST_IID` — The id of the merge request if it's present.
 - `APPSEMBLE_REVIEW_DOMAIN` — The review appsemble domain to use.
@@ -71,16 +77,21 @@ are used.
 
 ## Authentication
 
-Some fixtures call the Appsemble API using the Playwright `request` object. This expects you to have
-set an access token as environment variable with the name **ACCESS_TOKEN** beforehand. The easiest
-way to do this is by setting it in a setup step using the `loginUser` fixture.
-
-`auth.setup.ts`
+Some fixtures call the Appsemble API using the Playwright `request` object. This expects the worker
+to have logged in and set the access token in the `request` fixture beforehand. This can look like
+so:
 
 ```ts
-setup('authenticate', async ({ loginUser }) => {
-  const accessToken = await loginUser('bot', '12345');
-  process.env.ACCESS_TOKEN = accessToken;
+export const test = base.extend<{}>({
+  async request({}, use) {
+    const newRequest = await request.newContext({
+      extraHTTPHeaders: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    });
+    await use(newRequest);
+    await newRequest.dispose();
+  },
 });
 ```
 
@@ -91,5 +102,5 @@ When writing end-to-end tests, have a look at the
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.35.11-test.4/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.35.14/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/fixtures/index.d.ts

@@ -1,2 +1,2 @@
-export { expect } from './expect/index.js';
-export { test } from './test/index.js';
+export * from './expect/index.js';
+export * from './test/index.js';

package/fixtures/index.js

@@ -1,3 +1,3 @@
-export { expect } from './expect/index.js';
-export { test } from './test/index.js';
+export * from './expect/index.js';
+export * from './test/index.js';
 //# sourceMappingURL=index.js.map

package/fixtures/test/app/index.js

@@ -18,9 +18,6 @@ export const test = base.extend({
             }
             const response = await request.post('/api/apps', {
                 multipart: formData,
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
             });
             expect(response.status()).toBe(201);
             const app = (await response.json());
@@ -41,9 +38,6 @@ export const test = base.extend({
             }
             const response = await request.patch(`/api/apps/${appId}`, {
                 multipart: formData,
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
             });
             expect(response.status()).toBe(200);
             const app = (await response.json());
@@ -53,11 +47,7 @@ export const test = base.extend({
     },
     async deleteApp({ request }, use) {
         await use(async (appId) => {
-            const response = await request.delete(`/api/apps/${appId}`, {
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
-            });
+            const response = await request.delete(`/api/apps/${appId}`);
             expect(response.status()).toBe(204);
         });
     },
@@ -86,9 +76,6 @@ export const test = base.extend({
             };
             const response = await request.post(`/api/apps/${appId}/messages`, {
                 data: appMessages,
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
             });
             expect(response.status()).toBe(201);
             return (await response.json());

package/fixtures/test/app-collection/index.js

@@ -20,9 +20,6 @@ export const test = base.extend({
             }
             const response = await request.post(`/api/organizations/${organizationId}/app-collections`, {
                 multipart: formData,
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
             });
             expect(response.status()).toBe(201);
             const appCollection = (await response.json());
@@ -31,11 +28,7 @@ export const test = base.extend({
     },
     async deleteAppCollection({ request }, use) {
         await use(async (collectionId) => {
-            const response = await request.delete(`/api/app-collections/${collectionId}`, {
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
-            });
+            const response = await request.delete(`/api/app-collections/${collectionId}`);
             expect(response.status()).toBe(204);
         });
     },
@@ -45,9 +38,6 @@ export const test = base.extend({
                 data: {
                     AppId: appId,
                 },
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
             });
             expect(response.status()).toBe(204);
         });

package/fixtures/test/index.d.ts

@@ -1 +1,12 @@
-export declare const test: import("@playwright/test").TestType<import("@playwright/test").PlaywrightTestArgs & import("@playwright/test").PlaywrightTestOptions & import("./app/index.js").AppFixtures & import("./app-collection/index.js").AppCollectionFixtures & import("./demo-app/index.js").DemoAppFixtures & import("./group/index.js").GroupFixtures & import("./live-app/index.js").LiveAppFixtures & import("./organization/index.js").OrganizationFixtures & import("./resource/index.js").ResourceFixtures & import("./studio/index.js").StudioFixtures & import("./test-utils/index.js").TestUtilsFixtures & import("./training/index.js").TrainingFixtures, import("@playwright/test").PlaywrightWorkerArgs & import("@playwright/test").PlaywrightWorkerOptions>;
+/**
+ * Base test object with all utility fixtures
+ */
+export declare const baseTest: import("@playwright/test").TestType<import("@playwright/test").PlaywrightTestArgs & import("@playwright/test").PlaywrightTestOptions & import("./app/index.js").AppFixtures & import("./app-collection/index.js").AppCollectionFixtures & import("./demo-app/index.js").DemoAppFixtures & import("./group/index.js").GroupFixtures & import("./live-app/index.js").LiveAppFixtures & import("./organization/index.js").OrganizationFixtures & import("./resource/index.js").ResourceFixtures & import("./studio/index.js").StudioFixtures & import("./test-utils/index.js").TestUtilsFixtures & import("./training/index.js").TrainingFixtures, import("@playwright/test").PlaywrightWorkerArgs & import("@playwright/test").PlaywrightWorkerOptions>;
+/**
+ * Test object with the worker's storage state saved
+ *
+ * Used for tests that require a logged in user
+ */
+export declare const authenticatedTest: import("@playwright/test").TestType<import("@playwright/test").PlaywrightTestArgs & import("@playwright/test").PlaywrightTestOptions & import("./app/index.js").AppFixtures & import("./app-collection/index.js").AppCollectionFixtures & import("./demo-app/index.js").DemoAppFixtures & import("./group/index.js").GroupFixtures & import("./live-app/index.js").LiveAppFixtures & import("./organization/index.js").OrganizationFixtures & import("./resource/index.js").ResourceFixtures & import("./studio/index.js").StudioFixtures & import("./test-utils/index.js").TestUtilsFixtures & import("./training/index.js").TrainingFixtures, import("@playwright/test").PlaywrightWorkerArgs & import("@playwright/test").PlaywrightWorkerOptions & {
+    workerStorageState: string;
+}>;

package/fixtures/test/index.js

@@ -1,4 +1,7 @@
-import { mergeTests } from '@playwright/test';
+import { existsSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
+import { resolve } from 'node:path';
+import { expect, mergeTests, request } from '@playwright/test';
 import { test as appFixtures } from './app/index.js';
 import { test as appCollectionFixtures } from './app-collection/index.js';
 import { test as demoAppFixtures } from './demo-app/index.js';
@@ -9,5 +12,52 @@ import { test as resourceFixtures } from './resource/index.js';
 import { test as studioFixtures } from './studio/index.js';
 import { test as testUtilsFixtures } from './test-utils/index.js';
 import { test as trainingFixtures } from './training/index.js';
-export const test = mergeTests(appFixtures, appCollectionFixtures, demoAppFixtures, groupFixtures, liveAppFixtures, organizationFixtures, resourceFixtures, studioFixtures, testUtilsFixtures, trainingFixtures);
+/**
+ * Base test object with all utility fixtures
+ */
+export const baseTest = mergeTests(appFixtures, appCollectionFixtures, demoAppFixtures, groupFixtures, liveAppFixtures, organizationFixtures, resourceFixtures, studioFixtures, testUtilsFixtures, trainingFixtures);
+/**
+ * Test object with the worker's storage state saved
+ *
+ * Used for tests that require a logged in user
+ */
+export const authenticatedTest = baseTest.extend({
+    // Use the same storage state for all tests in this worker.
+    storageState: ({ workerStorageState }, use) => use(workerStorageState),
+    workerStorageState: [
+        async ({ browser }, use, testInfo) => {
+            const id = `worker-${testInfo.parallelIndex}`;
+            const email = `${id}@appsemble.com`;
+            const password = id;
+            const fileName = resolve(testInfo.project.outputDir, `.auth/${id}.json`);
+            if (existsSync(fileName)) {
+                await use(fileName);
+                return;
+            }
+            const page = await browser.newPage({ storageState: undefined });
+            await page.goto(`${testInfo.project.use.baseURL}/en/login`);
+            await page.getByTestId('email').fill(email);
+            await page.getByTestId('password').fill(password);
+            await page.getByTestId('login').click();
+            // Wait until auth state is saved in browser storage
+            await expect(page.getByText('My Apps')).toBeVisible();
+            await page.context().storageState({ path: fileName });
+            await page.close();
+            await use(fileName);
+        },
+        { scope: 'worker' },
+    ],
+    async request({ baseURL, storageState }, use) {
+        const accessToken = JSON.parse(await readFile(String(storageState), 'utf8')).origins[0]
+            .localStorage[1].value;
+        const newRequest = await request.newContext({
+            baseURL,
+            extraHTTPHeaders: {
+                Authorization: `Bearer ${accessToken}`,
+            },
+        });
+        await use(newRequest);
+        await newRequest.dispose();
+    },
+});
 //# sourceMappingURL=index.js.map

package/fixtures/test/live-app/index.js

@@ -45,9 +45,6 @@ export const test = base.extend({
                     redirectUri: url,
                     scope: 'openid',
                 },
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
             });
             expect(response.status()).toBe(201);
         });

package/fixtures/test/organization/index.js

@@ -13,9 +13,6 @@ export const test = base.extend({
             formData.set('icon', icon ?? null);
             const response = await request.post('/api/organizations', {
                 multipart: formData,
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
             });
             expect(response.status()).toBe(201);
             return response.json();
@@ -23,11 +20,7 @@ export const test = base.extend({
     },
     async deleteOrganization({ request }, use) {
         await use(async (id) => {
-            const response = await request.delete(`/api/organizations/${id}`, {
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
-            });
+            const response = await request.delete(`/api/organizations/${id}`);
             expect(response.status()).toBe(200);
         });
     },

package/fixtures/test/resource/index.js

@@ -12,9 +12,6 @@ export const test = base.extend({
             }
             const response = await request.post(`/api/apps/${appId}/resources/${type}`, {
                 multipart: formData,
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
             });
             expect(response.status()).toBe(201);
             const resource = (await response.json());
@@ -24,11 +21,7 @@ export const test = base.extend({
     },
     async deleteAllResources({ request }, use) {
         await use(async (appId) => {
-            const response = await request.delete(`/api/apps/${appId}/resources`, {
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
-            });
+            const response = await request.delete(`/api/apps/${appId}/resources`);
             expect(response.status()).toBe(204);
         });
     },

package/fixtures/test/training/index.js

@@ -2,21 +2,13 @@ import { test as base, expect } from '@playwright/test';
 export const test = base.extend({
     async resetTrainingProgress({ request }, use) {
         await use(async () => {
-            const response = await request.delete('/api/trainings/completed', {
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
-            });
+            const response = await request.delete('/api/trainings/completed');
             expect(response.status()).toBe(204);
         });
     },
     async completeTraining({ request }, use) {
         await use(async (trainingId) => {
-            const response = await request.post(`/api/trainings/completed/${trainingId}`, {
-                headers: {
-                    Authorization: `Bearer ${process.env.ACCESS_TOKEN}`,
-                },
-            });
+            const response = await request.post(`/api/trainings/completed/${trainingId}`);
             expect(response.status()).toBe(201);
         });
     },

package/index.d.ts

@@ -1,2 +1,2 @@
-export { test } from './fixtures/test/index.js';
-export { expect } from './fixtures/expect/index.js';
+export * from './fixtures/expect/index.js';
+export * from './fixtures/test/index.js';

package/index.js

@@ -1,3 +1,3 @@
-export { test } from './fixtures/test/index.js';
-export { expect } from './fixtures/expect/index.js';
+export * from './fixtures/expect/index.js';
+export * from './fixtures/test/index.js';
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/e2e",
-  "version": "0.35.11-test.4",
+  "version": "0.35.14",
   "description": "End-to-end tests used for testing Appsemble apps in an existing environment.",
   "keywords": [
     "app",
@@ -38,16 +38,16 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/utils": "0.35.11-test.4",
-    "@appsemble/types": "0.35.11-test.4",
-    "@appsemble/lang-sdk": "0.35.11-test.4",
-    "jwt-decode": "^4.0.0",
-    "@fortawesome/fontawesome-free": "^6.0.0",
+    "@appsemble/lang-sdk": "0.35.14",
+    "@appsemble/node-utils": "0.35.14",
+    "@appsemble/types": "0.35.14",
     "@playwright/test": "1.51.1",
-    "bulma": "=0.9.3",
     "strip-indent": "^4.0.0"
   },
   "engines": {
     "node": ">=20"
+  },
+  "devDependencies": {
+    "eslint-plugin-playwright": "2.2.2"
   }
 }

package/playwright.config.js

@@ -5,14 +5,14 @@ const { APPSEMBLE_REVIEW_DOMAIN, APPSEMBLE_STAGING_DOMAIN, CI, CI_MERGE_REQUEST_
  */
 export default defineConfig({
     testMatch: '**/*.spec.ts',
-    // Tests aren't fully isolated so they shouldn't run in parallel
-    fullyParallel: false,
+    // Run tests in parallel
+    fullyParallel: true,
     // Fail the build on CI if you accidentally left test.only in the source code.
     forbidOnly: Boolean(CI),
     // Retry on CI only
     retries: CI ? 2 : 0,
-    // Concurrent tests run better on CI in general
-    workers: 1,
+    // Amount of workers to run tests with
+    workers: CI ? 2 : 1,
     // Reporter to use. See https://playwright.dev/docs/test-reporters
     reporter: [['junit', { outputFile: 'results.xml' }]],
     // Prevent the pipeline from timing out
@@ -50,22 +50,30 @@ export default defineConfig({
             use: { ...devices['Desktop Safari'] },
             fullyParallel: true,
         },
-        { name: 'setup', testMatch: /.*\.setup\.ts/ },
+        {
+            name: 'create-accounts',
+            testMatch: /create-accounts\.setup\.ts/,
+            teardown: 'teardown-accounts',
+        },
         {
             name: 'chromium',
-            use: { ...devices['Desktop Chrome'], storageState: '.auth/user.json' },
-            dependencies: ['setup'],
+            testIgnore: '**/static-ui/**',
+            use: { ...devices['Desktop Chrome'] },
+            dependencies: ['create-accounts'],
         },
         {
             name: 'firefox',
-            use: { ...devices['Desktop Firefox'], storageState: '.auth/user.json' },
-            dependencies: ['setup'],
+            testIgnore: '**/static-ui/**',
+            use: { ...devices['Desktop Firefox'] },
+            dependencies: ['create-accounts'],
         },
         {
             name: 'webkit',
-            use: { ...devices['Desktop Safari'], storageState: '.auth/user.json' },
-            dependencies: ['setup'],
+            testIgnore: '**/static-ui/**',
+            use: { ...devices['Desktop Safari'] },
+            dependencies: ['create-accounts'],
         },
+        { name: 'teardown-accounts', testMatch: /teardown-accounts\.setup\.ts/ },
     ],
 });
 //# sourceMappingURL=playwright.config.js.map

package/setup/create-accounts.setup.js

@@ -0,0 +1,11 @@
+import { createUser } from '@appsemble/node-utils';
+import { test as setup } from '@playwright/test';
+setup('create accounts for workers', async ({}, testInfo) => {
+    for (let i = 0; i < testInfo.config.workers; i += 1) {
+        const id = `worker-${i}`;
+        const email = `${id}@appsemble.com`;
+        const password = id;
+        await createUser(id, email, password);
+    }
+});
+//# sourceMappingURL=create-accounts.setup.js.map

package/setup/teardown-accounts.setup.d.ts

@@ -0,0 +1 @@
+export {};

package/setup/teardown-accounts.setup.js

@@ -0,0 +1,11 @@
+import { rm } from 'node:fs/promises';
+import { deleteUser } from '@appsemble/node-utils';
+import { test as setup } from '@playwright/test';
+setup('delete worker accounts', async ({}, testInfo) => {
+    for (let i = 0; i < testInfo.config.workers; i += 1) {
+        const email = `worker-${i}@appsemble.com`;
+        await deleteUser(email);
+    }
+    await rm(`${testInfo.project.outputDir}/.auth`, { recursive: true, force: true });
+});
+//# sourceMappingURL=teardown-accounts.setup.js.map

package/tests/demo-apps/empty.spec.js

@@ -1,5 +1,5 @@
 import { readFile } from 'node:fs/promises';
-import { expect, test } from '../../index.js';
+import { expect, authenticatedTest as test } from '../../index.js';
 let appId;
 let organizationId;
 test.describe('Empty', () => {

package/tests/demo-apps/holidays.spec.js

@@ -1,5 +1,5 @@
 import { readFile } from 'node:fs/promises';
-import { expect, test } from '../../index.js';
+import { expect, authenticatedTest as test } from '../../index.js';
 let appId;
 let organizationId;
 test.describe('Holidays', () => {

package/tests/demo-apps/notes.spec.js

@@ -1,5 +1,5 @@
 import { readFile } from 'node:fs/promises';
-import { expect, test } from '../../index.js';
+import { expect, authenticatedTest as test } from '../../index.js';
 let appId;
 let organizationId;
 test.describe('Notes', () => {

package/tests/demo-apps/person.spec.js

@@ -1,5 +1,5 @@
 import { readFile } from 'node:fs/promises';
-import { expect, test } from '../../index.js';
+import { expect, authenticatedTest as test } from '../../index.js';
 let appId;
 let organizationId;
 test.describe('Person', () => {

package/tests/static-ui/apps.spec.js

@@ -1,5 +1,5 @@
-import { expect, test } from '../../index.js';
-const { BOT_ACCOUNT_EMAIL, BOT_ACCOUNT_PASSWORD } = process.env;
+import { createUser, deleteUser } from '@appsemble/node-utils';
+import { expect, baseTest as test } from '../../index.js';
 test.describe('Apps', () => {
     // Prevent worker from being logged in automatically
     test.use({ storageState: { cookies: [], origins: [] } });
@@ -15,10 +15,15 @@ test.describe('Apps', () => {
     test('should show the page header', async ({ page }) => {
         await expect(page.getByRole('heading', { name: 'All Apps', exact: true })).toBeVisible();
     });
-    test('should display “My Apps” when logged in', async ({ loginUser, page }) => {
-        expect(BOT_ACCOUNT_EMAIL && BOT_ACCOUNT_PASSWORD).not.toBeUndefined();
-        await loginUser(BOT_ACCOUNT_EMAIL, BOT_ACCOUNT_PASSWORD);
+    test('should display “My Apps” when logged in', async ({ browser, loginUserOnPage, randomTestId, }) => {
+        const name = 'Test user';
+        const email = `${randomTestId()}@test.com`;
+        const password = '1';
+        await createUser(name, email, password);
+        const page = await browser.newPage({ storageState: undefined });
+        await loginUserOnPage(email, password, page);
         await expect(page.getByRole('heading', { name: 'My Apps', exact: true })).toBeVisible();
+        await deleteUser(email);
     });
     test('should render list of apps', async ({ page }) => {
         await expect(page.getByRole('link', { name: 'Test app Test org' }).first())

package/tests/static-ui/blocks.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../index.js';
+import { expect, baseTest as test } from '../../index.js';
 test.describe('Blocks', () => {
     test.beforeEach(async ({ page }) => {
         await page.route('**/api/blocks', async (route) => {

package/tests/static-ui/docs.spec.js

@@ -1,6 +1,6 @@
 import { AppPermission, predefinedAppRoles } from '@appsemble/lang-sdk';
 import { OrganizationPermission, predefinedOrganizationRoles } from '@appsemble/types';
-import { expect, test } from '../../index.js';
+import { expect, baseTest as test } from '../../index.js';
 test.describe('Docs', () => {
     test('should render the index page', async ({ page }) => {
         await page.goto('/en/docs');

package/tests/static-ui/individual-app.spec.js

@@ -1,11 +1,14 @@
-import { expect, test } from '../../index.js';
-const { BOT_ACCOUNT_EMAIL, BOT_ACCOUNT_PASSWORD } = process.env;
+import { createUser } from '@appsemble/node-utils';
+import { expect, baseTest as test } from '../../index.js';
 let page;
 test.describe('Individual app', () => {
-    test.beforeAll(async ({ browser, loginUserOnPage }) => {
+    test.beforeAll(async ({ browser, loginUserOnPage, randomTestId }) => {
+        const name = 'Test user';
+        const email = `${randomTestId()}@test.com`;
+        const password = '1';
+        await createUser(name, email, password);
         page = await browser.newPage({ storageState: undefined });
-        expect(BOT_ACCOUNT_EMAIL && BOT_ACCOUNT_PASSWORD).not.toBeUndefined();
-        await loginUserOnPage(BOT_ACCOUNT_EMAIL, BOT_ACCOUNT_PASSWORD, page);
+        await loginUserOnPage(email, password, page);
     });
     test.afterAll(async () => {
         await page.close();

package/tests/static-ui/organizations.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../index.js';
+import { expect, baseTest as test } from '../../index.js';
 test.describe('Organizations', () => {
     test.beforeEach(async ({ page }) => {
         await page.route('**/api/organizations', async (route) => {

package/tests/static-ui/training.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../fixtures/index.js';
+import { expect, baseTest as test } from '../../fixtures/index.js';
 test.describe('Training', () => {
     // Prevent worker from being logged in automatically
     test.use({ storageState: { cookies: [], origins: [] } });

package/tests/studio/app-collections/app-collections.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../../index.js';
+import { expect, authenticatedTest as test } from '../../../index.js';
 let organizationId;
 let appCollectionName;
 let appCollectionId;

package/tests/studio/individual-app.spec.js

@@ -1,5 +1,5 @@
 import { readFile } from 'node:fs/promises';
-import { expect, test } from '../../index.js';
+import { expect, authenticatedTest as test } from '../../index.js';
 let appId;
 test.describe('Individual app', () => {
     test.beforeAll(async ({ createApp, createOrganization, randomTestId }) => {

package/tests/studio/logins/appsemble.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../../index.js';
+import { expect, authenticatedTest as test } from '../../../index.js';
 test.describe('Appsemble OAuth2 app login', () => {
     test.fixme('should work', async ({ page }) => {
         await page.getByRole('link', { name: 'Login' }).click();

package/tests/studio/logins/demo.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../../index.js';
+import { expect, authenticatedTest as test } from '../../../index.js';
 test.describe('Demo login', () => {
     test.fixme('should work', async ({ page }) => {
         await page.getByRole('link', { name: 'Login' }).click();

package/tests/studio/logins/invite.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../../index.js';
+import { expect, authenticatedTest as test } from '../../../index.js';
 test.describe('App invite', () => {
     test.fixme('should work', async ({ page }) => {
         await expect(page.getByRole('heading', { name: 'Example Page A' })).toBeVisible();

package/tests/studio/logins/oauth2.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../../index.js';
+import { expect, authenticatedTest as test } from '../../../index.js';
 let app;
 let secret;
 test.describe('App OAuth2 login', () => {

package/tests/studio/logins/password.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../../index.js';
+import { expect, authenticatedTest as test } from '../../../index.js';
 test.describe('App password login', () => {
     test.fixme('should work', async ({ page }) => {
         await page.getByRole('link', { name: 'Login' }).click();

package/tests/studio/logins/register.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../../index.js';
+import { expect, authenticatedTest as test } from '../../../index.js';
 test.describe('App registration', () => {
     test.fixme('should work', async ({ page }) => {
         await page.getByRole('link', { name: 'Login' }).click();

package/tests/studio/logins/saml.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../../index.js';
+import { expect, authenticatedTest as test } from '../../../index.js';
 test.describe('App SAML login', () => {
     test.fixme('should work', async ({ page }) => {
         await page.getByRole('link', { name: 'Login' }).click();

package/tests/studio/organizations.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../index.js';
+import { expect, authenticatedTest as test } from '../../index.js';
 let organizationId;
 test.describe('Organizations', () => {
     test.beforeAll(async ({ createOrganization, randomTestId }) => {

package/tests/studio/payments/subscription-flow.spec.js

@@ -1,15 +1,26 @@
-import { expect, test } from '../../../fixtures/index.js';
-const organization = 'Appsemble';
+import { updateSubscription } from '@appsemble/node-utils';
+import { SubscriptionPlanType } from '@appsemble/types';
+import { expect, authenticatedTest as test } from '../../../fixtures/index.js';
+let organizationId;
 const email = 'test+test_mode@test.com';
 const streetName = 'street one';
 const houseNumber = '12a';
 const city = 'Eindhoven';
 const zipCode = '1234DF';
 const country = 'NL';
+const { CI } = process.env;
 test.describe('Payments', () => {
-    const { CI } = process.env;
+    test.beforeAll(async ({ createOrganization, randomTestId }) => {
+        organizationId = (await createOrganization({ id: randomTestId() })).id;
+    });
+    test.beforeEach(async () => {
+        await updateSubscription(organizationId, SubscriptionPlanType.Standard);
+    });
+    test.afterAll(async ({ deleteOrganization }) => {
+        await deleteOrganization(organizationId);
+    });
     test('should cancel a subscription', async ({ page }) => {
-        await page.goto(`/en/organizations/${organization.toLowerCase()}/subscriptions`);
+        await page.goto(`/en/organizations/${organizationId}/subscriptions`);
         await page
             .locator('.card:has-text("STANDARD")')
             .getByRole('button', { name: 'Cancel' })
@@ -24,15 +35,15 @@ test.describe('Payments', () => {
         }
     });
     (CI ? test.skip : test)('should confirm correct redirect by extension', async ({ page }) => {
-        await page.goto(`/en/organizations/${organization.toLowerCase()}/subscriptions`);
+        await page.goto(`/en/organizations/${organizationId}/subscriptions`);
         await page.locator('.card:has-text("STANDARD")').getByRole('link', { name: 'Extend' }).click();
-        await expect(page).toHaveTitle('Activate · Appsemble', { timeout: 10000 });
+        await expect(page).toHaveTitle('Activate · Appsemble');
     });
     test('should purchase a subscription', async ({ page }) => {
-        await page.goto(`/en/organizations/${organization.toLowerCase()}/subscriptions`);
+        await page.goto(`/en/organizations/${organizationId}/subscriptions`);
         await page.locator('.card:has-text("EXTENSIVE")').getByRole('link', { name: 'Switch' }).click();
         await expect(page.getByText('Select type of')).toBeVisible();
-        await expect(page.getByText('Total subscription priceActive subscription discountCoupon discountTotal price')).toBeVisible();
+        await expect(page.getByText('Total subscription price')).toBeVisible();
         await page.getByRole('button', { name: 'Checkout ' }).click();
         await page.getByLabel('Email').fill(email);
         await page.getByLabel('Street name').fill(streetName);
@@ -40,23 +51,23 @@ test.describe('Payments', () => {
         await page.getByLabel('City').fill(city);
         await page.getByLabel('Zip code').fill(zipCode);
         await page.getByLabel('Country').selectOption(country);
-        await page.getByLabel('Name', { exact: true }).fill(organization);
+        await page.getByLabel('Name', { exact: true }).fill(organizationId);
         await page.getByRole('button').getByText('Continue').click();
-        await expect(page.getByText('Total subscription priceActive subscription discountCoupon discountVAT 21%Total price')).toBeVisible();
+        await expect(page.getByText('Total subscription price')).toBeVisible();
         // eslint-disable-next-line playwright/no-conditional-in-test
         if (!CI) {
             await page.getByRole('button', { name: 'Summary ' }).click();
-            await expect(page).toHaveTitle('Appsemble b.v.', { timeout: 10000 });
+            await expect(page).toHaveTitle('Appsemble b.v.');
             await page.getByTestId('sepa_debit-accordion-item').click();
             await page.locator('[placeholder="\\NL00 AAAA 0000 0000 00"]').click();
             await page.locator('[placeholder="\\NL00 AAAA 0000 0000 00"]').fill('NL39RABO0300065264');
-            await page.getByLabel('Name on account').fill(organization);
+            await page.getByLabel('Name on account').fill(organizationId);
             await page.getByPlaceholder('Address line 1').fill(streetName);
             await page.getByPlaceholder('Postal code').fill(zipCode);
             await page.getByPlaceholder('City').fill(city);
             await page.getByTestId('hosted-payment-submit-button').click();
-            await expect(page.getByText('Purchase successful')).toBeVisible({ timeout: 30000 });
-            await expect(page.getByText('New expiration date')).toBeVisible({ timeout: 60000 });
+            await expect(page.getByText('Purchase successful')).toBeVisible();
+            await expect(page.getByText('New expiration date')).toBeVisible();
             await expect(page.getByText('Subscription plan')).toBeVisible();
             await expect(page.getByText('Renewal period')).toBeVisible();
             await expect(page.getByText('extensive')).toBeVisible();

package/tests/studio/root.spec.js

@@ -1,4 +1,4 @@
-import { expect, test } from '../../index.js';
+import { expect, authenticatedTest as test } from '../../index.js';
 test('should allow to switch languages', async ({ page }) => {
     await page.goto('/en/apps');
     await page.locator('button', { hasText: /EN/ }).click();

package/tests/studio/trainings.spec.js

@@ -1,11 +1,9 @@
-import { expect, test } from '../../index.js';
+import { expect, authenticatedTest as test } from '../../index.js';
 test.describe('Training', () => {
     test.beforeEach(async ({ page, resetTrainingProgress }) => {
         await resetTrainingProgress();
         await page.goto('/en/trainings');
     });
-    // We only have 1 account, so tests can influence each other
-    test.describe.configure({ mode: 'serial' });
     test("should show 'Training' in breadcrumbs", async ({ page }) => {
         await expect(page.getByLabel('Breadcrumbs').getByRole('listitem').filter({ hasText: 'Training' })).toBeVisible();
     });

package/setup/auth.setup.js

@@ -1,10 +0,0 @@
-import { expect, test as setup } from '../index.js';
-const { BOT_ACCOUNT_EMAIL, BOT_ACCOUNT_PASSWORD } = process.env;
-setup('authenticate', async ({ loginUser }) => {
-    expect(BOT_ACCOUNT_EMAIL && BOT_ACCOUNT_PASSWORD).not.toBeUndefined();
-    const accessToken = await loginUser(BOT_ACCOUNT_EMAIL, BOT_ACCOUNT_PASSWORD, true);
-    expect(accessToken).toStrictEqual(expect.any(String));
-    // Playwright uses this environment variable to authenticate API requests
-    process.env.ACCESS_TOKEN = accessToken;
-});
-//# sourceMappingURL=auth.setup.js.map