Merge pull request openshift#8809 from gouyang/login_with_regular_user

add support for login with normal user
christianaranda · Apr 29, 2021 · a9d4b34 · a9d4b34
2 parents 1d68a14 + 1ff0496
commit a9d4b34
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/frontend/packages/kubevirt-plugin/integration-tests-cypress/support/index.ts b/frontend/packages/kubevirt-plugin/integration-tests-cypress/support/index.ts
@@ -21,6 +21,7 @@ declare global {
  createUserTemplate(namespace: string): void;
  cdiCloner(namespace: string): void;
  waitForLoginPrompt(vmName: string, namespace: string): void;
+ Login(): void;
  }
  }
 }
@@ -145,3 +146,11 @@ Cypress.Commands.add('waitForLoginPrompt', (vmName: string, namespace: string) =
  timeout: 180000,
  });
 });
+
+Cypress.Commands.add('Login', () => {
+ if (Cypress.env('IDP')) {
+ cy.login(Cypress.env('IDP'), Cypress.env('IDP_USERNAME'), Cypress.env('IDP_PASSWORD'));
+ } else {
+ cy.login();
+ }
+});
diff --git a/...nd/packages/kubevirt-plugin/integration-tests-cypress/tests/devconsole/devconsole.spec.ts b/...nd/packages/kubevirt-plugin/integration-tests-cypress/tests/devconsole/devconsole.spec.ts
@@ -23,7 +23,7 @@ const vmName = `test-devconsole-${testName}`;
 describe('test dev console', () => {
  before(() => {
  cy.viewport(1536, 960);
- cy.login();
+ cy.Login();
  cy.visit('/');
  cy.createProject(testName);
  cy.cdiCloner(testName);

diff --git a/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/ssh/ssh.spec.ts b/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/ssh/ssh.spec.ts
@@ -14,7 +14,7 @@ describe('Connect to a VM using SSH testing', () => {
  sshVMDetailsPageTesting,
  ];
  before(() => {
- cy.login();
+ cy.Login();
  cy.visit('');
  cy.createProject(testName);
  });

diff --git a/...ages/kubevirt-plugin/integration-tests-cypress/tests/vm-template/customize-source.spec.ts b/...ages/kubevirt-plugin/integration-tests-cypress/tests/vm-template/customize-source.spec.ts
@@ -7,7 +7,7 @@ import { TEMPLATE_NAME, TEMPLATE_BASE_IMAGE, OS_IMAGES_NS } from '../../const/in
 
 describe('test vm template source image', () => {
  before(() => {
- cy.login();
+ cy.Login();
  cy.visit('');
  cy.createProject(testName);
  cy.deleteResource({