Skip to content

Commit

Permalink
fix: made all variables camelcase in filter tests (#4068)
Browse files Browse the repository at this point in the history
  • Loading branch information
jpaten committed Jul 26, 2024
1 parent cea6118 commit 6ac5bb0
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
20 changes: 10 additions & 10 deletions explorer/e2e/anvil/anvil-filters.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
} from "../testFunctions";
import { anvilFilters, anvilTabs, anvilTabTestOrder } from "./anvil-tabs";

const filter_index_list = [3, 4, 5, 10, 6, 2];
const filter_index_list_short = [1, 10, 3];
const filterIndexList = [3, 4, 5, 10, 6, 2];
const filterIndexListShort = [1, 10, 3];
test("Check that all filters exist on the Datasets tab and are clickable", async ({
page,
}) => {
Expand Down Expand Up @@ -60,9 +60,9 @@ test("Check that the first filter on the Datasets tab creates at least one check
.click();
// Expect all checkboxes to be unchecked initially and to work properly
await expect(page.getByRole("checkbox").first()).toBeVisible();
const all_checkboxes = await page.getByRole("checkbox").all();
for (let i = 0; i < all_checkboxes.length && i < 5; i++) {
const checkbox = all_checkboxes[i];
const allCheckboxes = await page.getByRole("checkbox").all();
for (let i = 0; i < allCheckboxes.length && i < 5; i++) {
const checkbox = allCheckboxes[i];
await checkbox.scrollIntoViewIfNeeded();
await expect(checkbox).not.toBeChecked();
await checkbox.click();
Expand All @@ -88,7 +88,7 @@ test("Check that filter menu counts match actual counts on the Datasets tab", as
const result = await testFilterCounts(
page,
anvilTabs.datasets,
filter_index_list.map((x) => anvilFilters[x]),
filterIndexList.map((x) => anvilFilters[x]),
25
);
if (!result) {
Expand All @@ -102,7 +102,7 @@ test("Check that filter menu counts match actual counts on the Activities tab",
await testFilterCounts(
page,
anvilTabs.activities,
filter_index_list.map((x) => anvilFilters[x]),
filterIndexList.map((x) => anvilFilters[x]),
25
);
});
Expand All @@ -114,7 +114,7 @@ test("Check that the blue filter bubbles match the selected filter for an arbitr
await testFilterBubbles(
page,
anvilTabs.files,
filter_index_list_short.map((x) => anvilFilters[x])
filterIndexListShort.map((x) => anvilFilters[x])
);
});

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

Expand All @@ -136,6 +136,6 @@ test("Check that the clear all button functions on the files tab", async ({
await testClearAll(
page,
anvilTabs.files,
filter_index_list_short.map((x) => anvilFilters[x])
filterIndexListShort.map((x) => anvilFilters[x])
);
});
48 changes: 24 additions & 24 deletions explorer/e2e/testFunctions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,11 @@ export async function testFilterPersistence(
await page.goto(tabOrder[0].url);
// Select the first checkbox on the test filter
await page.getByText(filterRegex(testFilter)).click();
const to_select = await getFirstFilterButton(page);
await expect(to_select.getByRole("checkbox")).not.toBeChecked();
await to_select.getByRole("checkbox").click();
const filterName = (await to_select.innerText()).split("\n")[0]; //MAY NEED TO ADD SOME CHECKING MECHANISM HERE
await expect(to_select.getByRole("checkbox")).toBeChecked();
const toSelect = await getFirstFilterButton(page);
await expect(toSelect.getByRole("checkbox")).not.toBeChecked();
await toSelect.getByRole("checkbox").click();
const filterName = (await toSelect.innerText()).split("\n")[0]; //MAY NEED TO ADD SOME CHECKING MECHANISM HERE
await expect(toSelect.getByRole("checkbox")).toBeChecked();
await page.locator("body").click();
// Expect at least some text to still be visible
await expect(getFirstElementTextLocator(page, 0)).toBeVisible();
Expand All @@ -279,8 +279,8 @@ export async function testFilterPersistence(
await expect(page.getByText(filterRegex(testFilter))).toBeVisible();
await page.getByText(filterRegex(testFilter)).dispatchEvent("click");
await page.waitForLoadState("load");
const previously_selected = getNamedFilterButton(page, filterName);
await expect(previously_selected.getByRole("checkbox")).toBeChecked();
const previouslySelected = getNamedFilterButton(page, filterName);
await expect(previouslySelected.getByRole("checkbox")).toBeChecked();
await page.waitForLoadState("load");
await page.locator("body").click();
}
Expand All @@ -291,18 +291,18 @@ export async function testFilterPersistence(
.click();
await expect(getFirstElementTextLocator(page, 0)).toBeVisible();
await page.getByText(filterRegex(testFilter)).click();
const previously_selected = getFirstFilterButton(page);
await expect(previously_selected).toContainText(filterName, {
const previouslySelected = getFirstFilterButton(page);
await expect(previouslySelected).toContainText(filterName, {
useInnerText: true,
});
await expect(previously_selected.getByRole("checkbox").first()).toBeChecked();
await expect(previouslySelected.getByRole("checkbox").first()).toBeChecked();
}

export async function testFilterCounts(
page: Page,
tab: TabDescription,
filters: string[],
elements_per_page: number
elementsPerPage: number
): Promise<boolean> {
await page.goto(tab.url);
// For each arbitrarily selected filter
Expand All @@ -311,26 +311,26 @@ export async function testFilterCounts(
await page.getByText(filterRegex(filter)).dispatchEvent("click");
// Get the number associated with the first filter button, and select it
await page.waitForLoadState("load");
const filter_button = getFirstFilterButton(page);
const filter_numbers = (await filter_button.innerText()).split("\n");
const filter_number =
filter_numbers.map((x) => Number(x)).find((x) => !isNaN(x) && x !== 0) ??
const filterButton = getFirstFilterButton(page);
const filterNumbers = (await filterButton.innerText()).split("\n");
const filterNumber =
filterNumbers.map((x) => Number(x)).find((x) => !isNaN(x) && x !== 0) ??
-1;
if (filter_number < 0) {
console.log(filter_numbers.map((x) => Number(x)));
if (filterNumber < 0) {
console.log(filterNumbers.map((x) => Number(x)));
return false;
}
// Check the filter
await filter_button.getByRole("checkbox").dispatchEvent("click");
await filterButton.getByRole("checkbox").dispatchEvent("click");
await page.waitForLoadState("load");
// Exit the filter menu
await page.locator("body").click();
await expect(page.getByRole("checkbox")).toHaveCount(0);
// Expect the displayed count of elements to be 0
const firstNumber =
filter_number <= elements_per_page ? filter_number : elements_per_page;
filterNumber <= elementsPerPage ? filterNumber : elementsPerPage;
await expect(
page.getByText("Results 1 - " + firstNumber + " of " + filter_number)
page.getByText("Results 1 - " + firstNumber + " of " + filterNumber)
).toBeVisible();
}
return true;
Expand Down Expand Up @@ -379,30 +379,30 @@ export async function testClearAll(
filters: string[]
): Promise<void> {
await page.goto(tab.url);
const selected_filter_list = [];
const selectedFilterList = [];
for (const filter of filters) {
await page.getByText(filterRegex(filter)).dispatchEvent("click");
await getFirstFilterButton(page).getByRole("checkbox").click();
await expect(
getFirstFilterButton(page).getByRole("checkbox")
).toBeChecked();
selected_filter_list.push(
selectedFilterList.push(
(await getFirstFilterButton(page).innerText())
.split("\n")
.find((x) => x.length > 0) ?? ""
);
await page.locator("body").click();
}
await page.getByText("Clear All").dispatchEvent("click");
for (const filter of selected_filter_list) {
for (const filter of selectedFilterList) {
await expect(
page.locator("#sidebar-positioner").getByText(filter)
).toHaveCount(0);
}
for (let i = 0; i < filters.length; i++) {
await page.getByText(filterRegex(filters[i])).dispatchEvent("click");
await expect(
getNamedFilterButton(page, selected_filter_list[i]).getByRole("checkbox")
getNamedFilterButton(page, selectedFilterList[i]).getByRole("checkbox")
).not.toBeChecked();
await page.locator("body").click();
}
Expand Down

0 comments on commit 6ac5bb0

Please sign in to comment.