two tests in one describe

    to see if beforeAll is only run once

Author: swadeley

tests/Integration/twouserRBACTest.spec.ts

@@ -5,7 +5,6 @@ import { randomName, randomUrl } from '../UI/helpers/repoHelpers';
 import { closePopupsIfExist, getRowByNameOrUrl } from '../UI/helpers/helpers';
 import fs from 'fs';
 import { deleteAllRepos } from '../UI/helpers/deleteRepositories';
-import { deleteAllPopularRepos } from '../UI/helpers/deletePopularRepositories';
 
 
 
@@ -35,15 +34,16 @@ test.beforeAll(async () => {
 
 const url = randomUrl();
 
-test.describe.serial("Run as first user", { tag: "@admin" }, () => {
-  test("Login as user 1", async ({ page }) => {
+test.describe.serial("Combined user tests", () => {
+  test("Login as user 1 (admin)", { tag: "@admin" }, async ({ page }) => {
     await test.step('Navigate to the repository page', async () => {
       await switchToUser(page, process.env.USER1USERNAME!);
-      console.log('Try to delete old repos');
+      console.log('\n   Try to delete old repos\n');
       await deleteAllRepos(page, `&search=${repoNamePrefix}`);
       await navigateToRepositories(page);
       await closePopupsIfExist(page);
     });
+
     await test.step('Create a repository', async () => {
       await page.getByRole('button', { name: 'Add repositories' }).first().click();
       await expect(page.getByRole('dialog', { name: 'Add custom repositories' })).toBeVisible();
@@ -54,6 +54,7 @@ test.describe.serial("Run as first user", { tag: "@admin" }, () => {
       await page.getByLabel('URL').fill(url);
       await page.getByRole('button', { name: 'Save', exact: true }).click();
     });
+
     await test.step('Read the repo', async () => {
       const repoName = getRepoName();
       const row = await getRowByNameOrUrl(page, repoName);
@@ -64,24 +65,24 @@ test.describe.serial("Run as first user", { tag: "@admin" }, () => {
       await expect(page.getByPlaceholder('Enter name', { exact: true })).toHaveValue(repoName);
       await expect(page.getByPlaceholder('https://', { exact: true })).toHaveValue(url);
     });
+
     await test.step('Update the repository', async () => {
       const repoName = getRepoName();
-      await page.getByPlaceholder('Enter name', { exact: true }).fill(repoName);
+      await page.getByPlaceholder('Enter name', { exact: true }).fill(`${repoName}-Edited`);
       await page.getByRole('button', { name: 'Save changes', exact: true }).click();
     });
   });
-});
 
-test.describe.serial("Run as second user", { tag: "@read-only" }, () => {
-  test("Login as user 2", async ({ page }) => {
+  test("Login as user 2 (read-only)", { tag: "@read-only" }, async ({ page }) => {
     await test.step('Navigate to the repository page', async () => {
       await switchToUser(page, process.env.RO_USER_USERNAME!);
       await navigateToRepositories(page);
       await closePopupsIfExist(page);
     });
+
     await test.step('Read the repo', async () => {
       const repoName = getRepoName();
-      const row = await getRowByNameOrUrl(page, repoName);
+      const row = await getRowByNameOrUrl(page, `${repoName}-Edited`);
       await expect(row.getByText('Valid')).toBeVisible({ timeout: 60000 });
       await row.getByLabel('Kebab toggle').click();
       await row.getByRole('menuitem', { name: 'Edit' }).click();