diff --git a/e2e/anvil/anvil-dataset.spec.ts b/e2e/anvil/anvil-dataset.spec.ts index 6b0ebe84b..ae17d36f3 100644 --- a/e2e/anvil/anvil-dataset.spec.ts +++ b/e2e/anvil/anvil-dataset.spec.ts @@ -25,8 +25,11 @@ describe("Dataset", () => { test("displays request access button", async ({ page }) => { await goToDataset(page, CHIP_TEXT_ACCESS_REQUIRED); - // Confirm request access button is visible. - const exportButton = getLinkWithText(page, BUTTON_TEXT_REQUEST_ACCESS); + // Confirm request access button is visible (can be link or dropdown button). + const exportButton = getLinkOrButtonWithText( + page, + BUTTON_TEXT_REQUEST_ACCESS + ); await expect(exportButton).toBeVisible(); }); @@ -210,6 +213,16 @@ function getLinkWithText(page: Page, buttonText: string): Locator { return page.locator(`a:has-text("${buttonText}")`); } +/** + * Return the link or button with the given text. + * @param page - Playwright page object. + * @param buttonText - The text of the element to find. + * @returns - Playwright locator object for the link or button. + */ +function getLinkOrButtonWithText(page: Page, buttonText: string): Locator { + return page.locator(`:is(a, button):has-text("${buttonText}")`); +} + /** * Navigate to the datasets list. * @param page - Playwright page object. diff --git a/e2e/anvil/anvil-filters.spec.ts b/e2e/anvil/anvil-filters.spec.ts index cbc0a6593..23d678709 100644 --- a/e2e/anvil/anvil-filters.spec.ts +++ b/e2e/anvil/anvil-filters.spec.ts @@ -45,19 +45,22 @@ test("Check that all filters exist on the Donors tab and are clickable", async ( await testFilterPresence(page, ANVIL_TABS.DONORS, ANVIL_FILTER_NAMES); }); -test("Check that all filters exist on the BioSamples tab and are clickable", async ({ +// TODO #4749 - re-enable when cc-dev is reverted to dev backend +test.skip("Check that all filters exist on the BioSamples tab and are clickable", async ({ page, }) => { await testFilterPresence(page, ANVIL_TABS.BIOSAMPLES, ANVIL_FILTER_NAMES); }); -test("Check that all filters exist on the Activities tab and are clickable", async ({ +// TODO #4749 - re-enable when cc-dev is reverted to dev backend +test.skip("Check that all filters exist on the Activities tab and are clickable", async ({ page, }) => { await testFilterPresence(page, ANVIL_TABS.ACTIVITIES, ANVIL_FILTER_NAMES); }); -test("Check that all filters exist on the Files tab and are clickable", async ({ +// TODO #4749 - re-enable when cc-dev is reverted to dev backend +test.skip("Check that all filters exist on the Files tab and are clickable", async ({ page, }) => { await testFilterPresence(page, ANVIL_TABS.FILES, ANVIL_FILTER_NAMES); diff --git a/e2e/anvil/anvil-pagination.spec.ts b/e2e/anvil/anvil-pagination.spec.ts index 349943721..3485cd443 100644 --- a/e2e/anvil/anvil-pagination.spec.ts +++ b/e2e/anvil/anvil-pagination.spec.ts @@ -16,7 +16,8 @@ test("Check first page has disabled back and enabled forward pagination buttons await testFirstPagePagination(page, ANVIL_TABS.DONORS); }); -test("Paginate through the entire Files tab to confirm that the page number stays consistent and that paginating forwards is disabled on the last page. Uses filters to reduce the amount of calls necessary", async ({ +// TODO #4749 - re-enable when cc-dev is reverted to dev backend +test.skip("Paginate through the entire Files tab to confirm that the page number stays consistent and that paginating forwards is disabled on the last page. Uses filters to reduce the amount of calls necessary", async ({ page, }) => { const result = await filterAndTestLastPagePagination( @@ -28,6 +29,7 @@ test("Paginate through the entire Files tab to confirm that the page number stay test.fail(); } }); +// end TODO #4749 test("Check forward and backwards pagination causes the page content to change on the Biosamples page", async ({ page, diff --git a/site-config/anvil-cmg/cc-dev/config.ts b/site-config/anvil-cmg/cc-dev/config.ts index dc2f5f4f8..5fa10a927 100644 --- a/site-config/anvil-cmg/cc-dev/config.ts +++ b/site-config/anvil-cmg/cc-dev/config.ts @@ -3,15 +3,27 @@ import { SiteConfig } from "../../common/entities"; import { makeConfig } from "../dev/config"; import { authenticationConfig } from "./authentication/authentication"; +// TODO #4749: Temporary - pointing cc-dev to prod backend (revert when done) +// const config: SiteConfig = { +// ...makeConfig( +// "https://anvilproject.dev.clevercanary.com", +// "https://anvilproject.dev.clevercanary.com", +// "https://service.anvil.gi.ucsc.edu", +// GIT_HUB_REPO_URL +// ), +// exportToTerraUrl: "https://bvdp-saturn-dev.appspot.com/", +// }; const config: SiteConfig = { ...makeConfig( "https://anvilproject.dev.clevercanary.com", "https://anvilproject.dev.clevercanary.com", - "https://service.anvil.gi.ucsc.edu", - GIT_HUB_REPO_URL + "https://service.explore.anvilproject.org", + GIT_HUB_REPO_URL, + "anvil13" // Prod catalog required by prod backend ), exportToTerraUrl: "https://bvdp-saturn-dev.appspot.com/", }; +// END TODO #4749 config.authentication = authenticationConfig;