Skip to content

Commit 55108ab

Browse files
author
Jonah Paten
authored
test: cleanup playwright tests (#4078) (#4079)
* fix: refactored tests (#4068) * fix: refactored tests (#4068) * fix: refactored locators and cleaned up typos in tests (#4078) * test: added tests for anvil-cmg datasets backpages (#4080) * test: fixed changes that broke with rebasing and made export tests skip (#4080) * fix: refactored tests (#4068) * fix: refactored locators and cleaned up typos in tests (#4078) * fix: removed redundant file-level configuration, increased anvil-catalog timeout to 60s (#4078) * test: corrected errors in complex rebase (#4078) * test: cleaned up pagination tests (#4078) * test: switched to MACRO_CASE for test constants (#4078) * test: fixed issues from rebase (#4078) * test: made tests not dependent on tab order and refactored constants to constants.ts (#4078) * test: removed redundant TODO (#4078) * test: attempt to fix flakiness with filter counts (#4078)
1 parent 47395ff commit 55108ab

19 files changed

+1106
-478
lines changed

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@ import {
33
testPreSelectedColumns,
44
testSelectableColumns,
55
} from "../testFunctions";
6-
import { anvilcatalogTabs } from "./anvilcatalog-tabs";
6+
import { ANVIL_CATALOG_TABS } from "./anvilcatalog-tabs";
77

88
test("Expect the checkboxes in the 'Edit Columns' menu to add those columns to the tab in the Consortia tab", async ({
99
page,
1010
}) => {
11-
const tab = anvilcatalogTabs.consortia;
11+
const tab = ANVIL_CATALOG_TABS.CONSORTIA;
1212
await testSelectableColumns(page, tab);
1313
});
1414

15-
test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the consortia tab", async ({
15+
test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the Consortia tab", async ({
1616
page,
1717
}) => {
18-
const tab = anvilcatalogTabs.consortia;
18+
const tab = ANVIL_CATALOG_TABS.CONSORTIA;
1919
await testPreSelectedColumns(page, tab);
2020
});
2121

22-
test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the studies tab", async ({
22+
test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the Studies tab", async ({
2323
page,
2424
}) => {
25-
const tab = anvilcatalogTabs.studies;
25+
const tab = ANVIL_CATALOG_TABS.STUDIES;
2626
await testPreSelectedColumns(page, tab);
2727
});
2828

29-
test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the workspaces tab", async ({
29+
test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the Workspaces tab", async ({
3030
page,
3131
}) => {
32-
const tab = anvilcatalogTabs.workspaces;
32+
const tab = ANVIL_CATALOG_TABS.WORKSPACES;
3333
await testPreSelectedColumns(page, tab);
3434
});

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

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
import { test } from "@playwright/test";
22
import { testSortCatalog } from "../testFunctions";
3-
import { anvilcatalogTabs } from "./anvilcatalog-tabs";
4-
5-
test.describe.configure({ mode: "parallel" });
6-
3+
import { ANVIL_CATALOG_TABS } from "./anvilcatalog-tabs";
74
test("On the Consortia tab, expect clicking the column header (the sort button) to keep the first element of the column visible", async ({
85
page,
96
}) => {
10-
await testSortCatalog(page, anvilcatalogTabs.consortia);
7+
const testResult = await testSortCatalog(page, ANVIL_CATALOG_TABS.CONSORTIA);
8+
if (!testResult) {
9+
test.fail();
10+
}
1111
});
1212

1313
test("On the Studies tab, expect clicking the column header (the sort button) to keep the first element of the column visible", async ({
1414
page,
1515
}) => {
16-
await testSortCatalog(page, anvilcatalogTabs.studies);
16+
const testResult = await testSortCatalog(page, ANVIL_CATALOG_TABS.STUDIES);
17+
if (!testResult) {
18+
test.fail();
19+
}
1720
});
1821

1922
test("On the Workspaces tab, expect clicking the column header (the sort button) to keep the first element of the column visible", async ({
2023
page,
2124
}) => {
22-
await testSortCatalog(page, anvilcatalogTabs.workspaces);
25+
const testResult = await testSortCatalog(page, ANVIL_CATALOG_TABS.WORKSPACES);
26+
if (!testResult) {
27+
test.fail();
28+
}
2329
});

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

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
import { test } from "@playwright/test";
22
import { testTab } from "../testFunctions";
3-
import { anvilcatalogTabs } from "./anvilcatalog-tabs";
3+
import { ANVIL_CATALOG_TABS } from "./anvilcatalog-tabs";
44

5-
test("Expect clicking the consortia tab to go to the correct url and to show all of the relevant columns when selected", async ({
5+
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 ({
66
page,
77
}) => {
8-
const tab = anvilcatalogTabs.consortia;
9-
await page.goto(anvilcatalogTabs.studies.url);
10-
await testTab(page, tab);
8+
await testTab(page, ANVIL_CATALOG_TABS.STUDIES, ANVIL_CATALOG_TABS.CONSORTIA);
119
});
1210

13-
test("Expect clicking the studies tab to go to the correct url and to show all of the relevant columns when selected", async ({
11+
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 ({
1412
page,
1513
}) => {
16-
const tab = anvilcatalogTabs.studies;
17-
await page.goto(anvilcatalogTabs.workspaces.url);
18-
await testTab(page, tab);
14+
await testTab(
15+
page,
16+
ANVIL_CATALOG_TABS.WORKSPACES,
17+
ANVIL_CATALOG_TABS.STUDIES
18+
);
1919
});
2020

21-
test("Expect clicking the workspaces tab to go to the correct url and to show all of the relevant columns when selected", async ({
21+
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 ({
2222
page,
2323
}) => {
24-
const tab = anvilcatalogTabs.workspaces;
25-
await page.goto(anvilcatalogTabs.consortia.url);
26-
await testTab(page, tab);
24+
await testTab(
25+
page,
26+
ANVIL_CATALOG_TABS.CONSORTIA,
27+
ANVIL_CATALOG_TABS.WORKSPACES
28+
);
2729
});

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

+22-49
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,42 @@
11
/* eslint-disable sonarjs/no-duplicate-string -- ignoring duplicate strings here */
2-
32
import { AnvilCatalogTabCollection, TabDescription } from "../testInterfaces";
3+
import {
4+
ANVIL_CATALOG_CONSORTIA_PRESELECTED_COLUMNS_BY_NAME,
5+
ANVIL_CATALOG_CONSORTIA_SELECTABLE_COLUMNS_BY_NAME,
6+
ANVIL_CATALOG_STUDIES_PRESELECTED_COLUMNS_BY_NAME,
7+
ANVIL_CATALOG_STUDIES_SELECTABLE_COLUMNS_BY_NAME,
8+
ANVIL_CATALOG_WORKSPACES_PRESELECTED_COLUMNS_BY_NAME,
9+
ANVIL_CATALOG_WORKSPACES_SELECTABLE_COLUMNS_BY_NAME,
10+
} from "./constants";
411

5-
export const anvilcatalogTabs: AnvilCatalogTabCollection = {
6-
consortia: {
12+
export const ANVIL_CATALOG_TABS: AnvilCatalogTabCollection = {
13+
CONSORTIA: {
714
emptyFirstColumn: false,
8-
preselectedColumns: [
9-
{ name: "Consortium", sortable: true },
10-
{ name: "dbGap Id", sortable: true },
11-
{ name: "Consent Codes", sortable: true },
12-
{ name: "Disease (indication)", sortable: true },
13-
{ name: "Data Type", sortable: true },
14-
{ name: "Study Design", sortable: true },
15-
{ name: "Participants", sortable: true },
16-
{ name: "Size (TB)", sortable: true },
17-
],
18-
selectableColumns: [
19-
{ name: "Study", sortable: true },
20-
{ name: "Workspaces", sortable: true },
21-
],
15+
preselectedColumns: ANVIL_CATALOG_CONSORTIA_PRESELECTED_COLUMNS_BY_NAME,
16+
selectableColumns: ANVIL_CATALOG_CONSORTIA_SELECTABLE_COLUMNS_BY_NAME,
2217
tabName: "Consortia",
2318
url: "/data/consortia",
2419
},
25-
studies: {
20+
STUDIES: {
2621
emptyFirstColumn: false,
27-
preselectedColumns: [
28-
{ name: "Study", sortable: true },
29-
{ name: "dbGap Id", sortable: true },
30-
{ name: "Consortium", sortable: true },
31-
{ name: "Consent Codes", sortable: true },
32-
{ name: "Disease (indication)", sortable: true },
33-
{ name: "Data Type", sortable: true },
34-
{ name: "Study Design", sortable: true },
35-
{ name: "Workspaces", sortable: true },
36-
{ name: "Participants", sortable: true },
37-
{ name: "Size (TB)", sortable: true },
38-
],
39-
selectableColumns: [],
22+
preselectedColumns: ANVIL_CATALOG_STUDIES_PRESELECTED_COLUMNS_BY_NAME,
23+
selectableColumns: ANVIL_CATALOG_STUDIES_SELECTABLE_COLUMNS_BY_NAME,
4024
tabName: "Studies",
4125
url: "/data/studies",
4226
},
43-
workspaces: {
27+
WORKSPACES: {
4428
emptyFirstColumn: false,
45-
preselectedColumns: [
46-
{ name: "Consortium", sortable: true },
47-
{ name: "Terra Workspace", sortable: true },
48-
{ name: "Study", sortable: true },
49-
{ name: "dbGap Id", sortable: true },
50-
{ name: "Consent Code", sortable: true },
51-
{ name: "Disease (indication)", sortable: true },
52-
{ name: "Data Type", sortable: true },
53-
{ name: "Study Design", sortable: false },
54-
{ name: "Participants", sortable: true },
55-
{ name: "Size (TB)", sortable: true },
56-
],
57-
selectableColumns: [],
29+
preselectedColumns: ANVIL_CATALOG_WORKSPACES_PRESELECTED_COLUMNS_BY_NAME,
30+
selectableColumns: ANVIL_CATALOG_WORKSPACES_SELECTABLE_COLUMNS_BY_NAME,
5831
tabName: "Workspaces",
5932
url: "/data/workspaces",
6033
},
6134
};
6235

63-
export const anvilCatalogTabList: TabDescription[] = [
64-
anvilcatalogTabs.consortia,
65-
anvilcatalogTabs.studies,
66-
anvilcatalogTabs.workspaces,
36+
export const ANVIL_CATALOG_TAB_LIST: TabDescription[] = [
37+
ANVIL_CATALOG_TABS.CONSORTIA,
38+
ANVIL_CATALOG_TABS.STUDIES,
39+
ANVIL_CATALOG_TABS.WORKSPACES,
6740
];
6841

6942
/* eslint-enable sonarjs/no-duplicate-string -- Checking duplicate strings again*/

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

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
import { test } from "@playwright/test";
22
import { testUrl } from "../testFunctions";
3-
import { anvilCatalogTabList, anvilcatalogTabs } from "./anvilcatalog-tabs";
3+
import {
4+
ANVIL_CATALOG_TABS,
5+
ANVIL_CATALOG_TAB_LIST,
6+
} from "./anvilcatalog-tabs";
47

58
test("Expect the consortia tab to appear as selected when the corresponding url is accessed", async ({
69
page,
710
}) => {
8-
const tab = anvilcatalogTabs.consortia;
9-
await testUrl(page, tab, anvilCatalogTabList);
11+
const tab = ANVIL_CATALOG_TABS.CONSORTIA;
12+
await testUrl(page, tab, ANVIL_CATALOG_TAB_LIST);
1013
});
1114

1215
test("Expect the studies tab to appear as selected when the corresponding url is accessedb", async ({
1316
page,
1417
}) => {
15-
const tab = anvilcatalogTabs.studies;
16-
await testUrl(page, tab, anvilCatalogTabList);
18+
const tab = ANVIL_CATALOG_TABS.STUDIES;
19+
await testUrl(page, tab, ANVIL_CATALOG_TAB_LIST);
1720
});
1821

1922
test("Expect the workspaces tab to appear as selected when the corresponding url is accessed", async ({
2023
page,
2124
}) => {
22-
const tab = anvilcatalogTabs.workspaces;
23-
await testUrl(page, tab, anvilCatalogTabList);
25+
const tab = ANVIL_CATALOG_TABS.WORKSPACES;
26+
await testUrl(page, tab, ANVIL_CATALOG_TAB_LIST);
2427
});

0 commit comments

Comments
 (0)