test: cleanup playwright tests (#4078)

explorer/e2e/anvil-catalog/anvilcatalog-select-tabs.spec.ts

@@ -3,32 +3,32 @@ import {
   testPreSelectedColumns,
   testSelectableColumns,
 } from "../testFunctions";
-import { anvilcatalogTabs } from "./anvilcatalog-tabs";
+import { ANVIL_CATALOG_TABS } from "./anvilcatalog-tabs";
 
 test("Expect the checkboxes in the 'Edit Columns' menu to add those columns to the tab in the Consortia tab", async ({
   page,
 }) => {
-  const tab = anvilcatalogTabs.consortia;
+  const tab = ANVIL_CATALOG_TABS.CONSORTIA;
   await testSelectableColumns(page, tab);
 });
 
-test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the consortia tab", async ({
+test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the Consortia tab", async ({
   page,
 }) => {
-  const tab = anvilcatalogTabs.consortia;
+  const tab = ANVIL_CATALOG_TABS.CONSORTIA;
   await testPreSelectedColumns(page, tab);
 });
 
-test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the studies tab", async ({
+test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the Studies tab", async ({
   page,
 }) => {
-  const tab = anvilcatalogTabs.studies;
+  const tab = ANVIL_CATALOG_TABS.STUDIES;
   await testPreSelectedColumns(page, tab);
 });
 
-test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the workspaces tab", async ({
+test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the Workspaces tab", async ({
   page,
 }) => {
-  const tab = anvilcatalogTabs.workspaces;
+  const tab = ANVIL_CATALOG_TABS.WORKSPACES;
   await testPreSelectedColumns(page, tab);
 });

explorer/e2e/anvil-catalog/anvilcatalog-sort.spec.ts

@@ -1,23 +1,29 @@
 import { test } from "@playwright/test";
 import { testSortCatalog } from "../testFunctions";
-import { anvilcatalogTabs } from "./anvilcatalog-tabs";
-
-test.describe.configure({ mode: "parallel" });
-
+import { ANVIL_CATALOG_TABS } from "./anvilcatalog-tabs";
 test("On the Consortia tab, expect clicking the column header (the sort button) to keep the first element of the column visible", async ({
   page,
 }) => {
-  await testSortCatalog(page, anvilcatalogTabs.consortia);
+  const testResult = await testSortCatalog(page, ANVIL_CATALOG_TABS.CONSORTIA);
+  if (!testResult) {
+    test.fail();
+  }
 });
 
 test("On the Studies tab, expect clicking the column header (the sort button) to keep the first element of the column visible", async ({
   page,
 }) => {
-  await testSortCatalog(page, anvilcatalogTabs.studies);
+  const testResult = await testSortCatalog(page, ANVIL_CATALOG_TABS.STUDIES);
+  if (!testResult) {
+    test.fail();
+  }
 });
 
 test("On the Workspaces tab, expect clicking the column header (the sort button) to keep the first element of the column visible", async ({
   page,
 }) => {
-  await testSortCatalog(page, anvilcatalogTabs.workspaces);
+  const testResult = await testSortCatalog(page, ANVIL_CATALOG_TABS.WORKSPACES);
+  if (!testResult) {
+    test.fail();
+  }
 });

explorer/e2e/anvil-catalog/anvilcatalog-tabs-buttons.spec.ts

@@ -1,27 +1,29 @@
 import { test } from "@playwright/test";
 import { testTab } from "../testFunctions";
-import { anvilcatalogTabs } from "./anvilcatalog-tabs";
+import { ANVIL_CATALOG_TABS } from "./anvilcatalog-tabs";
 
-test("Expect clicking the consortia tab to go to the correct url and to show all of the relevant columns when selected", async ({
+test("Expect clicking the Consortia tab from the Studies tab to go to the correct url and to show all of the relevant columns when selected", async ({
   page,
 }) => {
-  const tab = anvilcatalogTabs.consortia;
-  await page.goto(anvilcatalogTabs.studies.url);
-  await testTab(page, tab);
+  await testTab(page, ANVIL_CATALOG_TABS.STUDIES, ANVIL_CATALOG_TABS.CONSORTIA);
 });
 
-test("Expect clicking the studies tab to go to the correct url and to show all of the relevant columns when selected", async ({
+test("Expect clicking the Studies tab from the Workspaces tab to go to the correct url and to show all of the relevant columns when selected", async ({
   page,
 }) => {
-  const tab = anvilcatalogTabs.studies;
-  await page.goto(anvilcatalogTabs.workspaces.url);
-  await testTab(page, tab);
+  await testTab(
+    page,
+    ANVIL_CATALOG_TABS.WORKSPACES,
+    ANVIL_CATALOG_TABS.STUDIES
+  );
 });
 
-test("Expect clicking the workspaces tab to go to the correct url and to show all of the relevant columns when selected", async ({
+test("Expect clicking the Workspaces tab from the Consortia tab to go to the correct url and to show all of the relevant columns when selected", async ({
   page,
 }) => {
-  const tab = anvilcatalogTabs.workspaces;
-  await page.goto(anvilcatalogTabs.consortia.url);
-  await testTab(page, tab);
+  await testTab(
+    page,
+    ANVIL_CATALOG_TABS.CONSORTIA,
+    ANVIL_CATALOG_TABS.WORKSPACES
+  );
 });

explorer/e2e/anvil-catalog/anvilcatalog-tabs.ts

@@ -1,69 +1,42 @@
 /* eslint-disable sonarjs/no-duplicate-string  -- ignoring duplicate strings here */
-
 import { AnvilCatalogTabCollection, TabDescription } from "../testInterfaces";
+import {
+  ANVIL_CATALOG_CONSORTIA_PRESELECTED_COLUMNS_BY_NAME,
+  ANVIL_CATALOG_CONSORTIA_SELECTABLE_COLUMNS_BY_NAME,
+  ANVIL_CATALOG_STUDIES_PRESELECTED_COLUMNS_BY_NAME,
+  ANVIL_CATALOG_STUDIES_SELECTABLE_COLUMNS_BY_NAME,
+  ANVIL_CATALOG_WORKSPACES_PRESELECTED_COLUMNS_BY_NAME,
+  ANVIL_CATALOG_WORKSPACES_SELECTABLE_COLUMNS_BY_NAME,
+} from "./constants";
 
-export const anvilcatalogTabs: AnvilCatalogTabCollection = {
-  consortia: {
+export const ANVIL_CATALOG_TABS: AnvilCatalogTabCollection = {
+  CONSORTIA: {
     emptyFirstColumn: false,
-    preselectedColumns: [
-      { name: "Consortium", sortable: true },
-      { name: "dbGap Id", sortable: true },
-      { name: "Consent Codes", sortable: true },
-      { name: "Disease (indication)", sortable: true },
-      { name: "Data Type", sortable: true },
-      { name: "Study Design", sortable: true },
-      { name: "Participants", sortable: true },
-      { name: "Size (TB)", sortable: true },
-    ],
-    selectableColumns: [
-      { name: "Study", sortable: true },
-      { name: "Workspaces", sortable: true },
-    ],
+    preselectedColumns: ANVIL_CATALOG_CONSORTIA_PRESELECTED_COLUMNS_BY_NAME,
+    selectableColumns: ANVIL_CATALOG_CONSORTIA_SELECTABLE_COLUMNS_BY_NAME,
     tabName: "Consortia",
     url: "/data/consortia",
   },
-  studies: {
+  STUDIES: {
     emptyFirstColumn: false,
-    preselectedColumns: [
-      { name: "Study", sortable: true },
-      { name: "dbGap Id", sortable: true },
-      { name: "Consortium", sortable: true },
-      { name: "Consent Codes", sortable: true },
-      { name: "Disease (indication)", sortable: true },
-      { name: "Data Type", sortable: true },
-      { name: "Study Design", sortable: true },
-      { name: "Workspaces", sortable: true },
-      { name: "Participants", sortable: true },
-      { name: "Size (TB)", sortable: true },
-    ],
-    selectableColumns: [],
+    preselectedColumns: ANVIL_CATALOG_STUDIES_PRESELECTED_COLUMNS_BY_NAME,
+    selectableColumns: ANVIL_CATALOG_STUDIES_SELECTABLE_COLUMNS_BY_NAME,
     tabName: "Studies",
     url: "/data/studies",
   },
-  workspaces: {
+  WORKSPACES: {
     emptyFirstColumn: false,
-    preselectedColumns: [
-      { name: "Consortium", sortable: true },
-      { name: "Terra Workspace", sortable: true },
-      { name: "Study", sortable: true },
-      { name: "dbGap Id", sortable: true },
-      { name: "Consent Code", sortable: true },
-      { name: "Disease (indication)", sortable: true },
-      { name: "Data Type", sortable: true },
-      { name: "Study Design", sortable: false },
-      { name: "Participants", sortable: true },
-      { name: "Size (TB)", sortable: true },
-    ],
-    selectableColumns: [],
+    preselectedColumns: ANVIL_CATALOG_WORKSPACES_PRESELECTED_COLUMNS_BY_NAME,
+    selectableColumns: ANVIL_CATALOG_WORKSPACES_SELECTABLE_COLUMNS_BY_NAME,
     tabName: "Workspaces",
     url: "/data/workspaces",
   },
 };
 
-export const anvilCatalogTabList: TabDescription[] = [
-  anvilcatalogTabs.consortia,
-  anvilcatalogTabs.studies,
-  anvilcatalogTabs.workspaces,
+export const ANVIL_CATALOG_TAB_LIST: TabDescription[] = [
+  ANVIL_CATALOG_TABS.CONSORTIA,
+  ANVIL_CATALOG_TABS.STUDIES,
+  ANVIL_CATALOG_TABS.WORKSPACES,
 ];
 
 /* eslint-enable sonarjs/no-duplicate-string -- Checking duplicate strings again*/

explorer/e2e/anvil-catalog/anvilcatalog-url.spec.ts

@@ -1,24 +1,27 @@
 import { test } from "@playwright/test";
 import { testUrl } from "../testFunctions";
-import { anvilCatalogTabList, anvilcatalogTabs } from "./anvilcatalog-tabs";
+import {
+  ANVIL_CATALOG_TABS,
+  ANVIL_CATALOG_TAB_LIST,
+} from "./anvilcatalog-tabs";
 
 test("Expect the consortia tab to appear as selected when the corresponding url is accessed", async ({
   page,
 }) => {
-  const tab = anvilcatalogTabs.consortia;
-  await testUrl(page, tab, anvilCatalogTabList);
+  const tab = ANVIL_CATALOG_TABS.CONSORTIA;
+  await testUrl(page, tab, ANVIL_CATALOG_TAB_LIST);
 });
 
 test("Expect the studies tab to appear as selected when the corresponding url is accessedb", async ({
   page,
 }) => {
-  const tab = anvilcatalogTabs.studies;
-  await testUrl(page, tab, anvilCatalogTabList);
+  const tab = ANVIL_CATALOG_TABS.STUDIES;
+  await testUrl(page, tab, ANVIL_CATALOG_TAB_LIST);
 });
 
 test("Expect the workspaces tab to appear as selected when the corresponding url is accessed", async ({
   page,
 }) => {
-  const tab = anvilcatalogTabs.workspaces;
-  await testUrl(page, tab, anvilCatalogTabList);
+  const tab = ANVIL_CATALOG_TABS.WORKSPACES;
+  await testUrl(page, tab, ANVIL_CATALOG_TAB_LIST);
 });