Skip to content

Commit a18b866

Browse files
committed
fix: made all variables camelcase in filter tests (#4068)
1 parent 6771978 commit a18b866

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

explorer/e2e/anvil/anvil-filters.spec.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {
1010
} from "../testFunctions";
1111
import { anvilFilters, anvilTabs, anvilTabTestOrder } from "./anvil-tabs";
1212

13-
const filter_index_list = [3, 4, 5, 10, 6, 2];
14-
const filter_index_list_short = [1, 10, 3];
13+
const filterIndexList = [3, 4, 5, 10, 6, 2];
14+
const filterIndexListShort = [1, 10, 3];
1515
test("Check that all filters exist on the Datasets tab and are clickable", async ({
1616
page,
1717
}) => {
@@ -60,9 +60,9 @@ test("Check that the first filter on the Datasets tab creates at least one check
6060
.click();
6161
// Expect all checkboxes to be unchecked initially and to work properly
6262
await expect(page.getByRole("checkbox").first()).toBeVisible();
63-
const all_checkboxes = await page.getByRole("checkbox").all();
64-
for (let i = 0; i < all_checkboxes.length && i < 5; i++) {
65-
const checkbox = all_checkboxes[i];
63+
const allCheckboxes = await page.getByRole("checkbox").all();
64+
for (let i = 0; i < allCheckboxes.length && i < 5; i++) {
65+
const checkbox = allCheckboxes[i];
6666
await checkbox.scrollIntoViewIfNeeded();
6767
await expect(checkbox).not.toBeChecked();
6868
await checkbox.click();
@@ -88,7 +88,7 @@ test("Check that filter menu counts match actual counts on the Datasets tab", as
8888
const result = await testFilterCounts(
8989
page,
9090
anvilTabs.datasets,
91-
filter_index_list.map((x) => anvilFilters[x]),
91+
filterIndexList.map((x) => anvilFilters[x]),
9292
25
9393
);
9494
if (!result) {
@@ -102,7 +102,7 @@ test("Check that filter menu counts match actual counts on the Activities tab",
102102
await testFilterCounts(
103103
page,
104104
anvilTabs.activities,
105-
filter_index_list.map((x) => anvilFilters[x]),
105+
filterIndexList.map((x) => anvilFilters[x]),
106106
25
107107
);
108108
});
@@ -114,7 +114,7 @@ test("Check that the blue filter bubbles match the selected filter for an arbitr
114114
await testFilterBubbles(
115115
page,
116116
anvilTabs.files,
117-
filter_index_list_short.map((x) => anvilFilters[x])
117+
filterIndexListShort.map((x) => anvilFilters[x])
118118
);
119119
});
120120

@@ -125,7 +125,7 @@ test("Check that the blue filter bubbles match the selected filter for an arbitr
125125
await testFilterBubbles(
126126
page,
127127
anvilTabs.biosamples,
128-
filter_index_list_short.map((x) => anvilFilters[x])
128+
filterIndexListShort.map((x) => anvilFilters[x])
129129
);
130130
});
131131

@@ -136,6 +136,6 @@ test("Check that the clear all button functions on the files tab", async ({
136136
await testClearAll(
137137
page,
138138
anvilTabs.files,
139-
filter_index_list_short.map((x) => anvilFilters[x])
139+
filterIndexListShort.map((x) => anvilFilters[x])
140140
);
141141
});

explorer/e2e/testFunctions.ts

+24-24
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,11 @@ export async function testFilterPersistence(
262262
await page.goto(tabOrder[0].url);
263263
// Select the first checkbox on the test filter
264264
await page.getByText(filterRegex(testFilter)).click();
265-
const to_select = await getFirstFilterButton(page);
266-
await expect(to_select.getByRole("checkbox")).not.toBeChecked();
267-
await to_select.getByRole("checkbox").click();
268-
const filterName = (await to_select.innerText()).split("\n")[0]; //MAY NEED TO ADD SOME CHECKING MECHANISM HERE
269-
await expect(to_select.getByRole("checkbox")).toBeChecked();
265+
const toSelect = await getFirstFilterButton(page);
266+
await expect(toSelect.getByRole("checkbox")).not.toBeChecked();
267+
await toSelect.getByRole("checkbox").click();
268+
const filterName = (await toSelect.innerText()).split("\n")[0]; //MAY NEED TO ADD SOME CHECKING MECHANISM HERE
269+
await expect(toSelect.getByRole("checkbox")).toBeChecked();
270270
await page.locator("body").click();
271271
// Expect at least some text to still be visible
272272
await expect(getFirstElementTextLocator(page, 0)).toBeVisible();
@@ -279,8 +279,8 @@ export async function testFilterPersistence(
279279
await expect(page.getByText(filterRegex(testFilter))).toBeVisible();
280280
await page.getByText(filterRegex(testFilter)).dispatchEvent("click");
281281
await page.waitForLoadState("load");
282-
const previously_selected = getNamedFilterButton(page, filterName);
283-
await expect(previously_selected.getByRole("checkbox")).toBeChecked();
282+
const previouslySelected = getNamedFilterButton(page, filterName);
283+
await expect(previouslySelected.getByRole("checkbox")).toBeChecked();
284284
await page.waitForLoadState("load");
285285
await page.locator("body").click();
286286
}
@@ -291,18 +291,18 @@ export async function testFilterPersistence(
291291
.click();
292292
await expect(getFirstElementTextLocator(page, 0)).toBeVisible();
293293
await page.getByText(filterRegex(testFilter)).click();
294-
const previously_selected = getFirstFilterButton(page);
295-
await expect(previously_selected).toContainText(filterName, {
294+
const previouslySelected = getFirstFilterButton(page);
295+
await expect(previouslySelected).toContainText(filterName, {
296296
useInnerText: true,
297297
});
298-
await expect(previously_selected.getByRole("checkbox").first()).toBeChecked();
298+
await expect(previouslySelected.getByRole("checkbox").first()).toBeChecked();
299299
}
300300

301301
export async function testFilterCounts(
302302
page: Page,
303303
tab: TabDescription,
304304
filters: string[],
305-
elements_per_page: number
305+
elementsPerPage: number
306306
): Promise<boolean> {
307307
await page.goto(tab.url);
308308
// For each arbitrarily selected filter
@@ -311,26 +311,26 @@ export async function testFilterCounts(
311311
await page.getByText(filterRegex(filter)).dispatchEvent("click");
312312
// Get the number associated with the first filter button, and select it
313313
await page.waitForLoadState("load");
314-
const filter_button = getFirstFilterButton(page);
315-
const filter_numbers = (await filter_button.innerText()).split("\n");
316-
const filter_number =
317-
filter_numbers.map((x) => Number(x)).find((x) => !isNaN(x) && x !== 0) ??
314+
const filterButton = getFirstFilterButton(page);
315+
const filterNumbers = (await filterButton.innerText()).split("\n");
316+
const filterNumber =
317+
filterNumbers.map((x) => Number(x)).find((x) => !isNaN(x) && x !== 0) ??
318318
-1;
319-
if (filter_number < 0) {
320-
console.log(filter_numbers.map((x) => Number(x)));
319+
if (filterNumber < 0) {
320+
console.log(filterNumbers.map((x) => Number(x)));
321321
return false;
322322
}
323323
// Check the filter
324-
await filter_button.getByRole("checkbox").dispatchEvent("click");
324+
await filterButton.getByRole("checkbox").dispatchEvent("click");
325325
await page.waitForLoadState("load");
326326
// Exit the filter menu
327327
await page.locator("body").click();
328328
await expect(page.getByRole("checkbox")).toHaveCount(0);
329329
// Expect the displayed count of elements to be 0
330330
const firstNumber =
331-
filter_number <= elements_per_page ? filter_number : elements_per_page;
331+
filterNumber <= elementsPerPage ? filterNumber : elementsPerPage;
332332
await expect(
333-
page.getByText("Results 1 - " + firstNumber + " of " + filter_number)
333+
page.getByText("Results 1 - " + firstNumber + " of " + filterNumber)
334334
).toBeVisible();
335335
}
336336
return true;
@@ -379,30 +379,30 @@ export async function testClearAll(
379379
filters: string[]
380380
): Promise<void> {
381381
await page.goto(tab.url);
382-
const selected_filter_list = [];
382+
const selectedFilterList = [];
383383
for (const filter of filters) {
384384
await page.getByText(filterRegex(filter)).dispatchEvent("click");
385385
await getFirstFilterButton(page).getByRole("checkbox").click();
386386
await expect(
387387
getFirstFilterButton(page).getByRole("checkbox")
388388
).toBeChecked();
389-
selected_filter_list.push(
389+
selectedFilterList.push(
390390
(await getFirstFilterButton(page).innerText())
391391
.split("\n")
392392
.find((x) => x.length > 0) ?? ""
393393
);
394394
await page.locator("body").click();
395395
}
396396
await page.getByText("Clear All").dispatchEvent("click");
397-
for (const filter of selected_filter_list) {
397+
for (const filter of selectedFilterList) {
398398
await expect(
399399
page.locator("#sidebar-positioner").getByText(filter)
400400
).toHaveCount(0);
401401
}
402402
for (let i = 0; i < filters.length; i++) {
403403
await page.getByText(filterRegex(filters[i])).dispatchEvent("click");
404404
await expect(
405-
getNamedFilterButton(page, selected_filter_list[i]).getByRole("checkbox")
405+
getNamedFilterButton(page, selectedFilterList[i]).getByRole("checkbox")
406406
).not.toBeChecked();
407407
await page.locator("body").click();
408408
}

0 commit comments

Comments
 (0)