make url dynamic

yonasberhe23 · Oct 19, 2023 · 765ea43 · 765ea43
1 parent 41c2a5e
commit 765ea43
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/cypress/e2e/po/pages/explorer/install-charts.po.ts b/cypress/e2e/po/pages/explorer/install-charts.po.ts
@@ -2,11 +2,16 @@ import PagePo from '@/cypress/e2e/po/pages/page.po';
 import AsyncButtonPo from '@/cypress/e2e/po/components/async-button.po';
 
 export class InstallChartsPage extends PagePo {
-  static url = '/c/local/apps/charts/install?repo-type=cluster&repo=rancher-charts'
+  private static createPath(clusterId: string) {
+    return `/c/${ clusterId }/apps/charts/install`;
+  }
+
+  static goTo(clusterId: string): Cypress.Chainable<Cypress.AUTWindow> {
+    return super.goTo(InstallChartsPage.createPath(clusterId));
+  }
 
-  constructor(pageUrl = InstallChartsPage.url) {
-    InstallChartsPage.url = pageUrl;
-    super(InstallChartsPage.url);
+  constructor(clusterId: string) {
+    super(InstallChartsPage.createPath(clusterId));
   }
 
   nextPage() {

diff --git a/cypress/e2e/tests/pages/explorer/cluster-tools.spec.ts b/cypress/e2e/tests/pages/explorer/cluster-tools.spec.ts
@@ -27,15 +27,12 @@ describe('Cluster Tools', { tags: '@adminUser' }, () => {
     clusterTools.getChartVersion(0).invoke('text').then((el) => {
       const chartVersion = el.trim().slice(1);
 
-      const chartsPageUrl = '/c/local/apps/charts/install?repo-type=cluster&repo=rancher-charts';
       const chartType = 'rancher-alerting-drivers';
-
-      const installAlertingDriversPage = `${ chartsPageUrl }&chart=${ chartType }&version=${ chartVersion }&tools`;
-
-      const installCharts = new InstallChartsPage(installAlertingDriversPage);
+      const installAlertingDriversPage = `repo-type=cluster&repo=rancher-charts&chart=${ chartType }&version=${ chartVersion }&tools`;
+      const installCharts = new InstallChartsPage('local');
 
       clusterTools.goToInstall(0);
-      installCharts.waitForPage();
+      installCharts.waitForPage(installAlertingDriversPage);
       installCharts.nextPage();
 
       cy.intercept('POST', 'v1/catalog.cattle.io.clusterrepos/rancher-charts?action=install').as('chartInstall');
@@ -51,7 +48,7 @@ describe('Cluster Tools', { tags: '@adminUser' }, () => {
     clusterTools.waitForPage();
     clusterTools.editChart(0);
 
-    const installCharts = new InstallChartsPage();
+    const installCharts = new InstallChartsPage('local');
 
     installCharts.nextPage();