fix: refactored locators and cleaned up typos in tests (#4078)

Author: mrtopsyt

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

@@ -5,23 +5,17 @@ import { anvilcatalogTabs } 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 ({
   page,
 }) => {
-  const tab = anvilcatalogTabs.consortia;
-  await page.goto(anvilcatalogTabs.studies.url);
-  await testTab(page, tab);
+  await testTab(page, anvilcatalogTabs.studies, anvilcatalogTabs.consortia);
 });
 
 test("Expect clicking the studies 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.consortia.url);
-  await testTab(page, tab);
+  await testTab(page, anvilcatalogTabs.workspaces, anvilcatalogTabs.studies);
 });
 
 test("Expect clicking the workspaces 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.workspaces.url);
-  await testTab(page, tab);
+  await testTab(page, anvilcatalogTabs.consortia, anvilcatalogTabs.workspaces);
 });

explorer/e2e/anvil/anvil-pagination-content.spec.ts

@@ -1,4 +1,5 @@
 import { expect, test } from "@playwright/test";
+import { getFirstElementTextLocator } from "../testFunctions";
 import { anvilTabs } from "./anvil-tabs";
 
 const pageCountRegex = /Page [0-9]+ of [0-9]+/;
@@ -16,13 +17,7 @@ test("Check forward and backwards pagination causes the page content to change o
     page.getByRole("tab").getByText(tab.tabName, { exact: true })
   ).toHaveAttribute("aria-selected", "true", { timeout: 25000 });
 
-  const firstElementTextLocator = page
-    .getByRole("rowgroup")
-    .nth(1)
-    .getByRole("row")
-    .nth(0)
-    .getByRole("cell")
-    .nth(0);
+  const firstElementTextLocator = getFirstElementTextLocator(page, 0);
 
   // Should start on first page
   await expect(page.getByText(pageCountRegex, { exact: true })).toHaveText(

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

@@ -5,39 +5,29 @@ import { anvilTabs } from "./anvil-tabs";
 test("Expect clicking the activities tab to go to the correct url and to show all of the relevant columns when selected", async ({
   page,
 }) => {
-  const tab = anvilTabs.activities;
-  await page.goto(anvilTabs.datasets.url);
-  await testTab(page, tab);
+  await testTab(page, anvilTabs.datasets, anvilTabs.activities);
 });
 
 test("Expect clicking the datasets tab to go to the correct url and to show all of the relevant columns when selected", async ({
   page,
 }) => {
-  const tab = anvilTabs.datasets;
-  await page.goto(anvilTabs.activities.url);
-  await testTab(page, tab);
+  await testTab(page, anvilTabs.activities, anvilTabs.datasets);
 });
 
 test("Expect clicking the files tab to go to the correct url and to show all of the relevant columns when selected", async ({
   page,
 }) => {
-  const tab = anvilTabs.files;
-  await page.goto(anvilTabs.datasets.url);
-  await testTab(page, tab);
+  await testTab(page, anvilTabs.datasets, anvilTabs.files);
 });
 
 test("Expect clicking the donors tab to go to the correct url and to show all of the relevant columns when selected", async ({
   page,
 }) => {
-  const tab = anvilTabs.donors;
-  await page.goto(anvilTabs.datasets.url);
-  await testTab(page, tab);
+  await testTab(page, anvilTabs.datasets, anvilTabs.donors);
 });
 
 test("Expect clicking the biosamples tab to go to the correct url and to show all of the relevant columns when selected", async ({
   page,
 }) => {
-  const tab = anvilTabs.biosamples;
-  await page.goto(anvilTabs.datasets.url);
-  await testTab(page, tab);
+  await testTab(page, anvilTabs.datasets, anvilTabs.biosamples);
 });