Fix integration tests (WIP)

Author: gansheer

integration-tests/cypress.config.js

@@ -23,4 +23,4 @@ module.exports = defineConfig({
     specPattern: 'tests/**/*.cy.{js,jsx,ts,tsx}',
     supportFile: 'support/index.ts',
   },
-});
+});

integration-tests/plugins/index.ts

@@ -1,4 +1,4 @@
-import * as wp from '@cypress/webpack-preprocessor';
+import wp from '@cypress/webpack-preprocessor';
 
 module.exports = (on, config) => {
   const options = {

integration-tests/support/login.ts

@@ -8,7 +8,6 @@ declare global {
 }
 
 const KUBEADMIN_USERNAME = 'kubeadmin';
-const loginUsername = Cypress.env('BRIDGE_KUBEADMIN_PASSWORD') ? 'user-dropdown' : 'username';
 
 // This will add 'cy.login(...)'
 // ex: cy.login('my-user', 'my-password')
@@ -27,7 +26,7 @@ Cypress.Commands.add('login', (username: string, password: string) => {
     cy.get('#inputPassword').type(password || Cypress.env('BRIDGE_KUBEADMIN_PASSWORD'));
     cy.get('button[type=submit]').click();
 
-    cy.get(`[data-test="${loginUsername}"]`).should('be.visible');
+    cy.get('[data-test="username"]').should('be.visible');
   });
 });
 
@@ -37,8 +36,8 @@ Cypress.Commands.add('logout', () => {
     if (win.SERVER_FLAGS?.authDisabled) {
       return;
     }
-    cy.get('[data-test="user-dropdown"]').click();
+    cy.get('[data-test="username"]').click();
     cy.get('[data-test="log-out"]').should('be.visible');
     cy.get('[data-test="log-out"]').click({ force: true });
   });
-});
+});

integration-tests/tests/example-page.cy.ts

@@ -4,6 +4,23 @@ const PLUGIN_TEMPLATE_NAME = 'camel-openshift-console-plugin';
 const PLUGIN_TEMPLATE_PULL_SPEC = Cypress.env('PLUGIN_TEMPLATE_PULL_SPEC');
 export const isLocalDevEnvironment = Cypress.config('baseUrl').includes('localhost');
 
+export const guidedTour = {
+  close: () => {
+    cy.get('body').then(($body) => {
+      if ($body.find(`[data-test="guided-tour-modal"]`).length > 0) {
+        cy.get(`[data-test="tour-step-footer-secondary"]`).contains('Skip tour').click();
+      }
+    });
+  },
+  isOpen: () => {
+    cy.get('body').then(($body) => {
+      if ($body.find(`[data-test="guided-tour-modal"]`).length > 0) {
+        cy.get(`[data-test="guided-tour-modal"]`).should('be.visible');
+      }
+    });
+  },
+};
+
 const installHelmChart = (path: string) => {
   cy.exec(
     `cd ../../camel-openshift-console-plugin && ${path} upgrade -i ${PLUGIN_TEMPLATE_NAME} charts/camel-openshift-console-plugin -n ${PLUGIN_TEMPLATE_NAME} --create-namespace --set plugin.image=${PLUGIN_TEMPLATE_PULL_SPEC}`,
@@ -35,7 +52,8 @@ const deleteHelmChart = (path: string) => {
 describe('Console plugin template test', () => {
   before(() => {
     cy.login();
-
+    guidedTour.isOpen();
+    guidedTour.close();
     if (!isLocalDevEnvironment) {
       console.log('this is not a local env, installig helm');
 
@@ -73,4 +91,4 @@ describe('Console plugin template test', () => {
     cy.url().should('include', '/example');
     cy.get('[data-test="example-page-title"]').should('contain', 'Hello, Plugin!');
   });
-});
+});

start-console.sh

@@ -51,4 +51,4 @@ if [ -x "$(command -v podman)" ]; then
 else
     BRIDGE_PLUGINS="${PLUGIN_NAME}=http://host.docker.internal:9001"
     docker run --pull always --platform $CONSOLE_IMAGE_PLATFORM --rm -p "$CONSOLE_PORT":9000 --env-file <(set | grep BRIDGE) $CONSOLE_IMAGE
-fi
+fi