[CY] polish baseUrl

cypress/pageobjects/clusterNetwork.po.ts

@@ -22,7 +22,7 @@ export default class SettingsPagePo extends CruResource {
         cy.get('span').contains(actionText).click();
 
         cy.get(this.detailPageHead).then(() => {
-            cy.url().should('eq', `${this.basePath()}${editPageUrl}/${urlSuffix}?mode=edit`)
+            cy.url().should('eq', `${Cypress.env('urlPath')}${editPageUrl}/${urlSuffix}?mode=edit`)
         })
     }
 }

cypress/pageobjects/settings.po.ts

@@ -28,7 +28,7 @@ export default class SettingsPagePo extends CruResource {
         cy.get('span').contains(actionText).click();
 
         cy.get(this.detailPageHead).then(() => {
-            cy.url().should('eq', `${this.basePath()}${editPageUrl}/${urlSuffix}?mode=edit`)
+            cy.url().should('eq', `${Cypress.env('urlPath')}${editPageUrl}/${urlSuffix}?mode=edit`)
         })
     }
 

cypress/pageobjects/volume.po.ts

@@ -117,8 +117,4 @@ export class VolumePage extends CruResourcePo {
         this.delete("default", volumeName.trim());
       });
   }
-
-  basePath() {
-    return Cypress.env('NODE_ENV') === 'dev' ? Cypress.env('baseUrl') : `${Cypress.env('baseUrl')}/dashboard`;
-  }
 }

cypress/plugins/index.js

@@ -28,6 +28,9 @@ module.exports = (on, config) => {
   // `on` is used to hook into various events Cypress emits
   // `config` is the resolved Cypress config
   config.baseUrl = config.env.baseUrl;
+
+  config.env.urlPath = config.env['NODE_ENV'] === 'dev' ? config.env.baseUrl : `${config.env.baseUrl}/dashboard`;
+
   on("task", {
     isFileExist,
     findFiles,

cypress/support/commands.js

@@ -10,8 +10,6 @@ Cypress.Commands.add('login', (params = {}) => {
     const username = params.username ||   Cypress.env('username');
     const password = params.password || Cypress.env('password');
 
-    const isDev = Cypress.env('NODE_ENV') === 'dev';
-    const baseUrl = isDev ? Cypress.config('baseUrl') : `${Cypress.config('baseUrl')}/dashboard`;
     cy.visit(`/auth/login`);
     cy.intercept('GET', '/v3-public/authProviders').as('authProviders');
     cy.wait('@authProviders').then(res => {
@@ -43,17 +41,11 @@ Cypress.Commands.add('stopOnFailed', () => {
   })
 })
 
-Cypress.Commands.overwrite('visit', (originalFn, url = '', options) => {
-  const isDev = Cypress.env('NODE_ENV') === 'dev';
-
-  if (!isDev) {
-    url = `/dashboard${url}`;
-  }
-
+Cypress.Commands.overwrite('visit', (originalFn, url, options) => {
+  url = Cypress.env('urlPath')
   return originalFn(url, options)
 })
 
-
 Cypress.on('uncaught:exception', (err, runable) => {
   return false;
 })

cypress/utils/components/page.po.ts

@@ -82,7 +82,7 @@ export class Navbar {
 
           cy.location().should(loc => {
             const deleteHash = loc.href.replace(loc.hash, '');
-            expect(deleteHash).to.eq(`${new Navbar().basePath()}/${matchUrl}`)
+            expect(deleteHash).to.eq(`${Cypress.env('urlPath')}/${matchUrl}`)
           })
 
           cy.wait(2000); // need to wait here, because when you click on the secondary menu, it will automatically jump to the first position in the secondary menu
@@ -104,7 +104,7 @@ export class Navbar {
       cy.get("nav a").contains(new RegExp("^" + navName + "$")).click();
       cy.location().should(loc => {
         const deleteHash = loc.href.replace(loc.hash, '');
-        expect(deleteHash).to.eq(`${this.basePath()}/${matchUrl}`)
+        expect(deleteHash).to.eq(`${Cypress.env('urlPath')}/${matchUrl}`)
       })
 
       cy.wait(2000);
@@ -120,10 +120,6 @@ export class Navbar {
       })
     }
   }
-
-  basePath() {
-    return Cypress.env('NODE_ENV') === 'dev' ? Cypress.env('baseUrl') : `${Cypress.env('baseUrl')}/dashboard`;
-  }
 }
 
 class Header {
@@ -157,24 +153,10 @@ export default class PagePo extends ComponentPo {
   }
 
   isCurrentPage(): Cypress.Chainable<boolean> {
-    return cy.url().then(url => url === Cypress.env('baseUrl') + this.wrapPath(this.path));
+    return cy.url().then(url => url === Cypress.env('urlPath') + this.path);
   }
 
   checkIsCurrentPage() {
     return this.isCurrentPage().should('eq', true);
   }
-
-  wrapPath(path: string) {
-    const isDev = Cypress.env('NODE_ENV') === 'dev';
-    let url = path;
-    if (!isDev) {
-      url = `/dashboard${path}`;
-    }
-
-    return url
-  }
-
-  basePath() {
-    return Cypress.env('NODE_ENV') === 'dev' ? Cypress.env('baseUrl') : `${Cypress.env('baseUrl')}/dashboard`;
-  }
 }