fix standard user tests

rancher · Nov 1, 2024 · f5beb84 · f5beb84
1 parent 86759e1
commit f5beb84
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/cypress/e2e/tests/setup/rancher-setup.spec.ts b/cypress/e2e/tests/setup/rancher-setup.spec.ts
@@ -109,6 +109,6 @@ describe('Rancher setup', { tags: ['@adminUserSetup', '@standardUserSetup', '@se
         role:        'project-member',
       },
       password: Cypress.env('password')
-    });
+    }, { createNameOptions: { onlyContext: true } });
   });
 });
diff --git a/cypress/globals.d.ts b/cypress/globals.d.ts
@@ -57,7 +57,8 @@ export type CreateAmazonRke2ClusterWithoutMachineConfigParams = {
 }
 
 export interface CreateResourceNameOptions {
-  prefixContext: boolean
+  onlyContext?: boolean
+  prefixContext?: boolean
 }
 
 declare global {

diff --git a/cypress/support/commands/commands.ts b/cypress/support/commands/commands.ts
@@ -73,7 +73,11 @@ Cypress.Commands.add('getRootE2EResourceName', () => {
 /**
  * Create resource name
  */
-Cypress.Commands.add('createE2EResourceName', (context, options = { prefixContext: false }) => {
+Cypress.Commands.add('createE2EResourceName', (context, options = { prefixContext: false, onlyContext: false }) => {
+  if (options?.onlyContext) {
+    return cy.wrap(context);
+  }
+
   return cy.getRootE2EResourceName().then((root) => options?.prefixContext ? `${ context }-${ root }` : `${ root }-${ context }`);
 });