[STYLE] Cypress utils unification (#62)

golemfoundation · Mar 12, 2024 · bd2443a · bd2443a
1 parent f13778d
commit bd2443a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/client/cypress/e2e/layout.cy.ts b/client/cypress/e2e/layout.cy.ts
@@ -2,7 +2,7 @@ import { navigateWithCheck, mockCoinPricesServer } from 'cypress/utils/e2e';
 import viewports from 'cypress/utils/viewports';
 import { IS_ONBOARDING_ALWAYS_VISIBLE, IS_ONBOARDING_DONE } from 'src/constants/localStorageKeys';
 import { navigationTabs } from 'src/constants/navigationTabs/navigationTabs';
-import { ROOT } from 'src/routes/RootRoutes/routes';
+import { ROOT, ROOT_ROUTES } from 'src/routes/RootRoutes/routes';
 
 Object.values(viewports).forEach(({ device, viewportWidth, viewportHeight }) => {
   describe(`layout: ${device}`, { viewportHeight, viewportWidth }, () => {
@@ -34,15 +34,15 @@ Object.values(viewports).forEach(({ device, viewportWidth, viewportHeight }) =>
     });
 
     it('Clicking on Octant logo redirects to projects view (outside projects view)', () => {
-      cy.get('[data-test=Navbar__Button--Settings]').click();
+      navigateWithCheck(ROOT_ROUTES.settings.absolute);
       cy.get('[data-test=SettingsView]').should('be.visible');
       cy.get('[data-test=MainLayout__Logo]').click();
       cy.get('[data-test=ProposalsView]').should('be.visible');
     });
 
     it('Clicking on Octant logo redirects to projects view (outside projects view) with memorized scrollY', () => {
       cy.scrollTo(0, 500);
-      cy.get('[data-test=Navbar__Button--Settings]').click();
+      navigateWithCheck(ROOT_ROUTES.settings.absolute);
       cy.get('[data-test=SettingsView]').should('be.visible');
       cy.get('[data-test=MainLayout__Logo]').click();
       cy.get('[data-test=ProposalsView]').should('be.visible');

diff --git a/client/cypress/utils/e2e.ts b/client/cypress/utils/e2e.ts
@@ -10,8 +10,9 @@ export const loadersShouldNotExist = (): Chainable<any> => {
 };
 
 export const checkLocationWithLoader = (url: string): Chainable<any> => {
-  cy.location('pathname').should('eq', url);
-  return loadersShouldNotExist();
+  // First loaders, since user can be moved between the routes before they disappear.
+  loadersShouldNotExist();
+  return cy.location('pathname').should('eq', url);
 };
 
 export const visitWithLoader = (urlEnter: string, urlEnd?: string): Chainable<any> => {