diff --git a/frontend/packages/console-app/console-extensions.json b/frontend/packages/console-app/console-extensions.json index f51e787ffde..30ee7430344 100644 --- a/frontend/packages/console-app/console-extensions.json +++ b/frontend/packages/console-app/console-extensions.json @@ -10,11 +10,20 @@ "importRedirectURL": { "$codeRef": "perspective.getImportRedirectURL" } } }, + { + "type": "console.flag", + "properties": { + "handler": { "$codeRef": "detectIntegrationTest.handler" } + } + }, { "type": "INTERNAL_DO_NOT_USE.guided-tour", "properties": { "perspective": "admin", "tour": { "$codeRef": "getGuidedTour" } + }, + "flags": { + "disallowed": ["INTEGRATION_TEST"] } }, { diff --git a/frontend/packages/console-app/package.json b/frontend/packages/console-app/package.json index cd398b60d94..adc485311f0 100644 --- a/frontend/packages/console-app/package.json +++ b/frontend/packages/console-app/package.json @@ -27,6 +27,7 @@ }, "consolePlugin": { "exposedModules": { + "detectIntegrationTest": "src/features/integration-test.ts", "tourContext": "src/components/tour/tour-context.ts", "quickStartContext": "src/components/quick-starts/utils/quick-start-context.tsx", "quickStartConfiguration": "src/components/quick-starts/QuickStartConfiguration.tsx", diff --git a/frontend/packages/console-app/src/consts.ts b/frontend/packages/console-app/src/consts.ts index f452b376559..6687dc83255 100644 --- a/frontend/packages/console-app/src/consts.ts +++ b/frontend/packages/console-app/src/consts.ts @@ -9,6 +9,7 @@ export const ACM_PERSPECTIVE_ID = 'acm'; export const ADMIN_PERSPECTIVE_ID = 'admin'; export const FLAG_CAN_GET_CONSOLE_OPERATOR_CONFIG = 'CAN_GET_CONSOLE_OPERATOR_CONFIG'; export const FLAG_TECH_PREVIEW = 'TECH_PREVIEW'; +export const FLAG_INTEGRATION_TEST = 'INTEGRATION_TEST'; export const FAVORITES_CONFIG_MAP_KEY = 'console.favorites'; export const FAVORITES_LOCAL_STORAGE_KEY = `${STORAGE_PREFIX}/favorites`; diff --git a/frontend/packages/console-app/src/features/integration-test.ts b/frontend/packages/console-app/src/features/integration-test.ts new file mode 100644 index 00000000000..e851f2e5b78 --- /dev/null +++ b/frontend/packages/console-app/src/features/integration-test.ts @@ -0,0 +1,18 @@ +import type { FeatureFlagHandler } from '@console/dynamic-plugin-sdk/src/extensions/feature-flags'; +import { FLAG_INTEGRATION_TEST } from '../consts'; + +const INTEGRATION_TEST_USER_AGENT = 'ConsoleIntegrationTestEnvironment'; + +/** + * Detect Cypress via a custom user agent we set in `cypress.config.js` in + * each cypress run configuration. + * + * This is used to disable certain features during integration tests to + * increase test reliability. + */ +export const handler: FeatureFlagHandler = (callback) => { + const userAgent = window.navigator.userAgent ?? ''; + + // No need to watch this as user agent cannot change during a session + callback(FLAG_INTEGRATION_TEST, userAgent === INTEGRATION_TEST_USER_AGENT); +}; diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/cypress.config.js b/frontend/packages/console-telemetry-plugin/integration-tests/cypress.config.js index 59be110eadc..55edb5d09e9 100644 --- a/frontend/packages/console-telemetry-plugin/integration-tests/cypress.config.js +++ b/frontend/packages/console-telemetry-plugin/integration-tests/cypress.config.js @@ -47,5 +47,6 @@ module.exports = defineConfig({ experimentalMemoryManagement: true, numTestsKeptInMemory: 5, injectDocumentDomain: true, + userAgent: 'ConsoleIntegrationTestEnvironment', }, }); diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/support/commands/hooks.ts b/frontend/packages/console-telemetry-plugin/integration-tests/support/commands/hooks.ts index 97c07ff79ef..30167a0df68 100644 --- a/frontend/packages/console-telemetry-plugin/integration-tests/support/commands/hooks.ts +++ b/frontend/packages/console-telemetry-plugin/integration-tests/support/commands/hooks.ts @@ -1,10 +1,7 @@ -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; - /* eslint-disable no-console, promise/catch-or-return */ before(() => { cy.login(); cy.document().its('readyState').should('eq', 'complete'); - guidedTour.close(); }); after(() => { diff --git a/frontend/packages/dev-console/console-extensions.json b/frontend/packages/dev-console/console-extensions.json index fd4830bfe76..a603676b5ca 100644 --- a/frontend/packages/dev-console/console-extensions.json +++ b/frontend/packages/dev-console/console-extensions.json @@ -27,6 +27,9 @@ "properties": { "perspective": "dev", "tour": { "$codeRef": "getGuidedTour" } + }, + "flags": { + "disallowed": ["INTEGRATION_TEST"] } }, diff --git a/frontend/packages/dev-console/integration-tests/cypress.config.js b/frontend/packages/dev-console/integration-tests/cypress.config.js index e04e08e7793..6f0ba9db985 100644 --- a/frontend/packages/dev-console/integration-tests/cypress.config.js +++ b/frontend/packages/dev-console/integration-tests/cypress.config.js @@ -49,5 +49,6 @@ module.exports = defineConfig({ experimentalMemoryManagement: true, numTestsKeptInMemory: 5, injectDocumentDomain: true, + userAgent: 'ConsoleIntegrationTestEnvironment', }, }); diff --git a/frontend/packages/dev-console/integration-tests/features/getting-started/getting-started-tour-dev-perspective.feature b/frontend/packages/dev-console/integration-tests/features/getting-started/getting-started-tour-dev-perspective.feature index bfe2f991f93..737c6339f05 100644 --- a/frontend/packages/dev-console/integration-tests/features/getting-started/getting-started-tour-dev-perspective.feature +++ b/frontend/packages/dev-console/integration-tests/features/getting-started/getting-started-tour-dev-perspective.feature @@ -1,4 +1,5 @@ -@getting-started @dev-console +# Guided tour is disabled in cypress due to endless flakes +@getting-started @dev-console @manual Feature: Getting Started tour of developer perspective As a user I want to take tour of developer perspective diff --git a/frontend/packages/dev-console/integration-tests/support/pages/app.ts b/frontend/packages/dev-console/integration-tests/support/pages/app.ts index 3e6407921f6..dd48b75be41 100644 --- a/frontend/packages/dev-console/integration-tests/support/pages/app.ts +++ b/frontend/packages/dev-console/integration-tests/support/pages/app.ts @@ -1,5 +1,4 @@ import { detailsPage } from '@console/cypress-integration-tests/views/details-page'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { modal } from '@console/cypress-integration-tests/views/modal'; import { nav } from '@console/cypress-integration-tests/views/nav'; import { topologyPO } from '@console/topology/integration-tests/support/page-objects/topology-po'; @@ -53,7 +52,6 @@ export const perspective = { nav.sidenav.switcher.changePerspectiveTo(perspectiveName); app.waitForLoad(); if (perspectiveName === switchPerspective.Developer) { - guidedTour.close(); // Commenting below line, because due to this pipeline runs feature file is failing // cy.testA11y('Developer perspective'); } diff --git a/frontend/packages/dev-console/integration-tests/support/pages/functions/checkDeveloperPerspective.ts b/frontend/packages/dev-console/integration-tests/support/pages/functions/checkDeveloperPerspective.ts index 660a651b991..8d3faeced90 100644 --- a/frontend/packages/dev-console/integration-tests/support/pages/functions/checkDeveloperPerspective.ts +++ b/frontend/packages/dev-console/integration-tests/support/pages/functions/checkDeveloperPerspective.ts @@ -1,7 +1,4 @@ -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; - export const checkDeveloperPerspective = () => { - guidedTour.close(); cy.get('body').then(($body) => { cy.byLegacyTestID('perspective-switcher-toggle').then(($switcher) => { // switcher is present @@ -32,7 +29,5 @@ export const checkDeveloperPerspective = () => { cy.document().its('readyState').should('eq', 'complete'); cy.log('perspective switcher menu refreshed'); }); - - guidedTour.close(); }); }; diff --git a/frontend/packages/dev-console/integration-tests/support/pages/functions/createGitWorkload.ts b/frontend/packages/dev-console/integration-tests/support/pages/functions/createGitWorkload.ts index d48b71dc9b0..93764e4539c 100644 --- a/frontend/packages/dev-console/integration-tests/support/pages/functions/createGitWorkload.ts +++ b/frontend/packages/dev-console/integration-tests/support/pages/functions/createGitWorkload.ts @@ -1,5 +1,4 @@ import { detailsPage } from '@console/cypress-integration-tests/views/details-page'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { topologyPage } from '@console/topology/integration-tests/support/pages/topology'; import { devNavigationMenu, addOptions, pageTitle } from '../../constants'; import { formPO, topologyPO } from '../../pageObjects'; @@ -7,7 +6,6 @@ import { addPage, gitPage } from '../add-flow'; import { createForm, navigateTo } from '../app'; export const selectImportFromGitQuickCreate = () => { - guidedTour.close(); cy.get('[data-test="quick-create-dropdown"]').click(); cy.get('[data-test="qc-import-from-git"] [role="menuitem"]') .should('be.visible') diff --git a/frontend/packages/dev-console/integration-tests/support/step-definitions/common/common.ts b/frontend/packages/dev-console/integration-tests/support/step-definitions/common/common.ts index 00ba4f1dc30..345569ba2ca 100644 --- a/frontend/packages/dev-console/integration-tests/support/step-definitions/common/common.ts +++ b/frontend/packages/dev-console/integration-tests/support/step-definitions/common/common.ts @@ -1,6 +1,5 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'; import { detailsPage } from '@console/cypress-integration-tests/views/details-page'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { modal } from '@console/cypress-integration-tests/views/modal'; import { nav } from '@console/cypress-integration-tests/views/nav'; import { switchPerspective, devNavigationMenu, adminNavigationMenu } from '../../constants'; @@ -14,7 +13,6 @@ Given('user has logged in as a basic user', () => { const password = Cypress.env('BRIDGE_HTPASSWD_PASSWORD') || 'test'; cy.login(idp, username, password); app.waitForLoad(); - guidedTour.close(); }); Given('user is at developer perspective', () => { @@ -22,7 +20,6 @@ Given('user is at developer perspective', () => { perspective.switchTo(switchPerspective.Developer); // Due to bug ODC-6231 // cy.testA11y('Developer perspective with guide tour modal'); - guidedTour.close(); nav.sidenav.switcher.shouldHaveText(switchPerspective.Developer); // Commenting below line, because it is executing on every test scenario - we will remove this in future releases // cy.testA11y('Developer perspective'); @@ -66,7 +63,6 @@ Given('user is at namespace {string}', (projectName: string) => { When('user switches to developer perspective', () => { perspective.switchTo(switchPerspective.Developer); - guidedTour.close(); }); When('user selects {string} option from Actions menu', (option: string) => { diff --git a/frontend/packages/dev-console/integration-tests/support/step-definitions/common/operators.ts b/frontend/packages/dev-console/integration-tests/support/step-definitions/common/operators.ts index 5d9ebb79df3..2c86a16219a 100644 --- a/frontend/packages/dev-console/integration-tests/support/step-definitions/common/operators.ts +++ b/frontend/packages/dev-console/integration-tests/support/step-definitions/common/operators.ts @@ -1,5 +1,4 @@ import { Given } from 'cypress-cucumber-preprocessor/steps'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { operators } from '../../constants'; import { installPipelinesOperatorUsingCLI, @@ -26,7 +25,6 @@ Given( (operator: operators, namespace: string) => { cy.logout(); cy.login(); // make sure we are logged in as kubeadmin - guidedTour.close(); verifyAndInstallOperator(operator, namespace); }, ); diff --git a/frontend/packages/dev-console/integration-tests/support/step-definitions/customization/configure-perspectives.ts b/frontend/packages/dev-console/integration-tests/support/step-definitions/customization/configure-perspectives.ts index a0df7b7f0b3..9d923f031d0 100644 --- a/frontend/packages/dev-console/integration-tests/support/step-definitions/customization/configure-perspectives.ts +++ b/frontend/packages/dev-console/integration-tests/support/step-definitions/customization/configure-perspectives.ts @@ -1,5 +1,4 @@ import { Given, Then, When } from 'cypress-cucumber-preprocessor/steps'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { nav } from '@console/cypress-integration-tests/views/nav'; import { switchPerspective } from '../../constants'; import { app, perspective } from '../../pages'; @@ -7,7 +6,6 @@ import { app, perspective } from '../../pages'; Given('user has logged in as admin user', () => { cy.login(); perspective.switchTo(switchPerspective.Administrator); - guidedTour.close(); nav.sidenav.switcher.shouldHaveText(switchPerspective.Administrator); }); diff --git a/frontend/packages/dev-console/integration-tests/support/step-definitions/health-checks/add-health-checks-topology-sidebar.ts b/frontend/packages/dev-console/integration-tests/support/step-definitions/health-checks/add-health-checks-topology-sidebar.ts index bcdc79a6305..c0ba5314b8e 100644 --- a/frontend/packages/dev-console/integration-tests/support/step-definitions/health-checks/add-health-checks-topology-sidebar.ts +++ b/frontend/packages/dev-console/integration-tests/support/step-definitions/health-checks/add-health-checks-topology-sidebar.ts @@ -1,6 +1,5 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'; import { detailsPage } from '@console/cypress-integration-tests/views/details-page'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { nav } from '@console/cypress-integration-tests/views/nav'; import { devNavigationMenu, switchPerspective } from '../../constants'; import { topologyPO } from '../../pageObjects'; @@ -40,7 +39,6 @@ When( detailsPage.titleShouldContain('Edit health checks'); cy.get('.odc-heath-check-probe__successText').should('have.length', 3); perspective.switchTo(switchPerspective.Developer); - guidedTour.close(); nav.sidenav.switcher.shouldHaveText(switchPerspective.Developer); navigateTo(devNavigationMenu.Topology); }, @@ -55,7 +53,6 @@ Then( detailsPage.titleShouldContain('Edit health checks'); cy.get('.odc-heath-check-probe__successText').contains(`${probe} added`).should('be.visible'); perspective.switchTo(switchPerspective.Developer); - guidedTour.close(); nav.sidenav.switcher.shouldHaveText(switchPerspective.Developer); navigateTo(devNavigationMenu.Topology); }, diff --git a/frontend/packages/dev-console/integration-tests/support/step-definitions/topology/create-workloads.ts b/frontend/packages/dev-console/integration-tests/support/step-definitions/topology/create-workloads.ts index a520ed559ae..480d88a06eb 100644 --- a/frontend/packages/dev-console/integration-tests/support/step-definitions/topology/create-workloads.ts +++ b/frontend/packages/dev-console/integration-tests/support/step-definitions/topology/create-workloads.ts @@ -1,5 +1,4 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { nav } from '@console/cypress-integration-tests/views/nav'; import { topologyPage, @@ -19,7 +18,6 @@ When('user applies cronjob YAML', () => { Then('user will see cron job with name {string} on topology page', (name: string) => { perspective.switchTo(switchPerspective.Developer); - guidedTour.close(); nav.sidenav.switcher.shouldHaveText(switchPerspective.Developer); topologyPage.verifyWorkloadInTopologyPage(`${name}`); }); @@ -30,7 +28,6 @@ When('user applies job YAML', () => { Then('user will see job with name {string} on topology page', (name: string) => { perspective.switchTo(switchPerspective.Developer); - guidedTour.close(); nav.sidenav.switcher.shouldHaveText(switchPerspective.Developer); topologyPage.verifyWorkloadInTopologyPage(`${name}`); }); @@ -41,7 +38,6 @@ When('user applies pod YAML', () => { Then('user will see pod with name {string} on topology page', (name: string) => { perspective.switchTo(switchPerspective.Developer); - guidedTour.close(); nav.sidenav.switcher.shouldHaveText(switchPerspective.Developer); topologyPage.verifyWorkloadInTopologyPage(`${name}`); }); diff --git a/frontend/packages/helm-plugin/integration-tests/cypress.config.js b/frontend/packages/helm-plugin/integration-tests/cypress.config.js index a98df0c5073..119e950c043 100644 --- a/frontend/packages/helm-plugin/integration-tests/cypress.config.js +++ b/frontend/packages/helm-plugin/integration-tests/cypress.config.js @@ -48,5 +48,6 @@ module.exports = defineConfig({ experimentalMemoryManagement: true, numTestsKeptInMemory: 5, injectDocumentDomain: true, + userAgent: 'ConsoleIntegrationTestEnvironment', }, }); diff --git a/frontend/packages/helm-plugin/integration-tests/support/commands/hooks.ts b/frontend/packages/helm-plugin/integration-tests/support/commands/hooks.ts index 07233f4fc8b..6aca5e95dae 100644 --- a/frontend/packages/helm-plugin/integration-tests/support/commands/hooks.ts +++ b/frontend/packages/helm-plugin/integration-tests/support/commands/hooks.ts @@ -1,5 +1,3 @@ -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; - // To ignore the resizeObserverLoopErrors on CI, adding below code const resizeObserverLoopErrRe = /^[^(ResizeObserver loop limit exceeded)]/; /* eslint-disable consistent-return */ @@ -22,7 +20,6 @@ before(() => { }); // Default helm repo has been changed to a new repo, so executing below line to fix that issue cy.exec('oc apply -f test-data/red-hat-helm-charts.yaml'); - guidedTour.close(); }); beforeEach(() => { diff --git a/frontend/packages/helm-plugin/integration-tests/support/step-definitions/common/common.ts b/frontend/packages/helm-plugin/integration-tests/support/step-definitions/common/common.ts index 7b645faf9ba..49d2dccf08d 100644 --- a/frontend/packages/helm-plugin/integration-tests/support/step-definitions/common/common.ts +++ b/frontend/packages/helm-plugin/integration-tests/support/step-definitions/common/common.ts @@ -1,5 +1,4 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { modal } from '@console/cypress-integration-tests/views/modal'; import { nav } from '@console/cypress-integration-tests/views/nav'; import { @@ -120,6 +119,5 @@ Given('user is at Add page', () => { Given('user has logged in as admin user', () => { cy.login(); perspective.switchTo(switchPerspective.Administrator); - guidedTour.close(); nav.sidenav.switcher.shouldHaveText(switchPerspective.Administrator); }); diff --git a/frontend/packages/integration-tests-cypress/cypress.config.js b/frontend/packages/integration-tests-cypress/cypress.config.js index 7e13edbb2e3..77bab43c50c 100644 --- a/frontend/packages/integration-tests-cypress/cypress.config.js +++ b/frontend/packages/integration-tests-cypress/cypress.config.js @@ -36,5 +36,6 @@ module.exports = defineConfig({ experimentalMemoryManagement: true, numTestsKeptInMemory: 5, injectDocumentDomain: true, + userAgent: 'ConsoleIntegrationTestEnvironment', }, }); diff --git a/frontend/packages/integration-tests-cypress/support/admin.ts b/frontend/packages/integration-tests-cypress/support/admin.ts index 26290264166..54e07c35efc 100644 --- a/frontend/packages/integration-tests-cypress/support/admin.ts +++ b/frontend/packages/integration-tests-cypress/support/admin.ts @@ -1,4 +1,3 @@ -import { guidedTour } from '../views/guided-tour'; import { nav } from '../views/nav'; declare global { @@ -19,7 +18,6 @@ Cypress.Commands.add('initAdmin', () => { cy.log('ensure perspective switcher is set to Core platform'); nav.sidenav.switcher.changePerspectiveTo('Core platform'); nav.sidenav.switcher.shouldHaveText('Core platform'); - guidedTour.close(); }); Cypress.Commands.add('initDeveloper', () => { @@ -28,10 +26,8 @@ Cypress.Commands.add('initDeveloper', () => { cy.byTestID('loading-indicator').should('not.exist'); cy.document().its('readyState').should('eq', 'complete'); cy.log('ensure perspective switcher is set to Developer'); - guidedTour.close(); nav.sidenav.switcher.changePerspectiveTo('Developer'); cy.log('switched perspective to Developer'); nav.sidenav.switcher.shouldHaveText('Developer'); cy.log('Developer perspective confirmed '); - guidedTour.close(); }); diff --git a/frontend/packages/integration-tests-cypress/tests/app/admission-webhook-warning-notifications.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/admission-webhook-warning-notifications.cy.ts index dd95f37273c..1ab87be3785 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/admission-webhook-warning-notifications.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/admission-webhook-warning-notifications.cy.ts @@ -1,6 +1,5 @@ import { checkErrors, testName } from '../../support'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import * as yamlEditor from '../../views/yaml-editor'; const POD_NAME = 'pod1'; @@ -68,7 +67,7 @@ spec: capabilities: drop: - ALL ---- +--- apiVersion: apps/v1 kind: Deployment metadata: @@ -107,7 +106,6 @@ spec: describe('Admission Webhook warning notification', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/app/auth-multiuser-login.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/auth-multiuser-login.cy.ts index 8470e920a3d..4c13fde24d0 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/auth-multiuser-login.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/auth-multiuser-login.cy.ts @@ -1,5 +1,4 @@ import { checkErrors } from '../../support'; -import { guidedTour } from '../../views/guided-tour'; import { masthead } from '../../views/masthead'; import { nav } from '../../views/nav'; @@ -25,10 +24,8 @@ describe('Auth test', () => { cy.login(idp, username, passwd); cy.url().should('include', Cypress.config('baseUrl')); - // test Developer perspective is default for test user and guided tour is displayed + // test Developer perspective is default for test user // Below line to be uncommented after pr https://github.com/openshift/console-operator/pull/954 is merged - guidedTour.isOpen(); - guidedTour.close(); masthead.username.shouldHaveText(username); cy.log('switches from dev to admin perspective'); @@ -72,8 +69,6 @@ describe('Auth test', () => { if (!Cypress.config('baseUrl').includes('localhost')) { // nav.sidenav.switcher.changePerspectiveTo('Developer'); // nav.sidenav.switcher.shouldHaveText('Developer'); - guidedTour.isOpen(); - guidedTour.close(); nav.sidenav.switcher.changePerspectiveTo('Core platform'); nav.sidenav.switcher.shouldHaveText('Core platform'); } diff --git a/frontend/packages/integration-tests-cypress/tests/app/debug-pod.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/debug-pod.cy.ts index 97c820eb9ac..370f4322814 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/debug-pod.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/debug-pod.cy.ts @@ -1,6 +1,5 @@ import { checkErrors, testName } from '../../support'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import * as yamlEditor from '../../views/yaml-editor'; @@ -29,7 +28,6 @@ spec: describe('Debug pod', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/app/demo-dynamic-plugin.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/demo-dynamic-plugin.cy.ts index 1bba663030d..22f4677488f 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/demo-dynamic-plugin.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/demo-dynamic-plugin.cy.ts @@ -2,7 +2,6 @@ import { safeLoadAll } from 'js-yaml'; import { checkErrors } from '../../support'; import { isLocalDevEnvironment } from '../../views/common'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { masthead } from '../../views/masthead'; import { modal } from '../../views/modal'; @@ -85,7 +84,6 @@ if (!Cypress.env('OPENSHIFT_CI') || Cypress.env('PLUGIN_PULL_SPEC')) { describe('Demo dynamic plugin test', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(PLUGIN_NAME); cy.readFile(`${PLUGIN_PATH}/oc-manifest.yaml`).then((textManifest) => { const yamlManifest = safeLoadAll(textManifest); diff --git a/frontend/packages/integration-tests-cypress/tests/app/filtering-and-searching.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/filtering-and-searching.cy.ts index 892a02f38c3..aa8afa0d1be 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/filtering-and-searching.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/filtering-and-searching.cy.ts @@ -2,7 +2,6 @@ import { safeLoad, safeDump } from 'js-yaml'; import * as _ from 'lodash'; import { checkErrors, testName } from '../../support'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { modal } from '../../views/modal'; import * as yamlEditor from '../../views/yaml-editor'; @@ -13,7 +12,6 @@ describe('Filtering and Searching', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); cy.visit(`/k8s/ns/${testName}/deployments`); listPage.clickCreateYAMLbutton(); diff --git a/frontend/packages/integration-tests-cypress/tests/app/masthead.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/masthead.cy.ts index b443fc757fe..94b75ac3819 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/masthead.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/masthead.cy.ts @@ -1,6 +1,5 @@ import { checkErrors } from '../../support'; import { isLocalDevEnvironment } from '../../views/common'; -import { guidedTour } from '../../views/guided-tour'; import { masthead } from '../../views/masthead'; describe('Masthead', () => { @@ -8,7 +7,6 @@ describe('Masthead', () => { // clear any existing sessions Cypress.session.clearAllSavedSessions(); cy.login(); - guidedTour.close(); }); afterEach(() => { diff --git a/frontend/packages/integration-tests-cypress/tests/app/node-terminal.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/node-terminal.cy.ts index 910d08a86d3..6ab2052dd97 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/node-terminal.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/node-terminal.cy.ts @@ -1,12 +1,10 @@ import { checkErrors } from '../../support'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; describe('Node terminal', () => { before(() => { cy.login(); - guidedTour.close(); }); beforeEach(() => { diff --git a/frontend/packages/integration-tests-cypress/tests/app/overview.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/overview.cy.ts index b4e5b0c55a1..cfcdd51d3fb 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/overview.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/overview.cy.ts @@ -9,7 +9,6 @@ import { } from '../../../../public/models'; import { checkErrors, testName } from '../../support'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { masthead } from '../../views/masthead'; import { overviewPage } from '../../views/overview'; import * as yamlEditor from '../../views/yaml-editor'; @@ -24,7 +23,6 @@ const overviewResources = ImmutableSet([ describe('Visiting Overview page', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/app/poll-console-updates.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/poll-console-updates.cy.ts index cfda06f3456..0da381c817a 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/poll-console-updates.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/poll-console-updates.cy.ts @@ -1,6 +1,5 @@ import { checkErrors } from '../../support'; import { refreshWebConsoleLink } from '../../views/form'; -import { guidedTour } from '../../views/guided-tour'; const CHECK_UPDATES_URL = '/api/check-updates'; const CHECK_UPDATES_ALIAS = 'checkUpdates'; @@ -44,7 +43,6 @@ const WAIT_OPTIONS = { requestTimeout: 300000 }; const loadApp = () => { cy.visit('/'); - guidedTour.close(); }; const checkConsoleUpdateToast = () => { cy.byTestID(refreshWebConsoleLink).should('exist').click(); @@ -56,7 +54,6 @@ const checkConsoleUpdateToast = () => { xdescribe('PollConsoleUpdates Test', () => { before(() => { cy.login(); - guidedTour.close(); }); afterEach(() => { diff --git a/frontend/packages/integration-tests-cypress/tests/app/resource-log.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/resource-log.cy.ts index d02ea196541..be8510a28a1 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/resource-log.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/resource-log.cy.ts @@ -1,6 +1,5 @@ import { checkErrors, testName } from '../../support'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { logs } from '../../views/logs'; @@ -11,7 +10,6 @@ describe('Pod log viewer tab', () => { const podAnnoFilename = 'pod-with-wrap-annotation.yaml'; before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/app/start-job-from-cronjob.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/start-job-from-cronjob.cy.ts index c9518775be8..08efc0ae1c4 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/start-job-from-cronjob.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/start-job-from-cronjob.cy.ts @@ -1,6 +1,5 @@ import { checkErrors, testName } from '../../support'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import * as yamlEditor from '../../views/yaml-editor'; @@ -29,7 +28,6 @@ spec: describe('Start a Job from a CronJob', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/app/template.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/template.cy.ts index cee66589336..d58c8ec69fe 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/template.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/template.cy.ts @@ -1,5 +1,4 @@ import { catalog } from '../../views/catalogs'; -import { guidedTour } from '../../views/guided-tour'; describe('template feature', () => { before(() => { @@ -8,7 +7,6 @@ describe('template feature', () => { expect(result.stdout).to.include('created'); }); cy.login(); - guidedTour.close(); }); after(() => { diff --git a/frontend/packages/integration-tests-cypress/tests/app/yaml-editor-settings.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/yaml-editor-settings.cy.ts index 6263fef138b..c581c051586 100644 --- a/frontend/packages/integration-tests-cypress/tests/app/yaml-editor-settings.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/app/yaml-editor-settings.cy.ts @@ -1,6 +1,5 @@ import { checkErrors } from '../../support'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { isImportLoaded, @@ -30,7 +29,6 @@ describe('YAML Editor Settings', () => { before(() => { cy.login(); cy.visit('/k8s/ns/default/import'); - guidedTour.close(); }); beforeEach(() => { diff --git a/frontend/packages/integration-tests-cypress/tests/cluster-settings/oauth.cy.ts b/frontend/packages/integration-tests-cypress/tests/cluster-settings/oauth.cy.ts index 1f95ab41c51..39f730de448 100644 --- a/frontend/packages/integration-tests-cypress/tests/cluster-settings/oauth.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/cluster-settings/oauth.cy.ts @@ -1,5 +1,4 @@ import { checkErrors, testName } from '../../support'; -import { guidedTour } from '../../views/guided-tour'; import { oauth } from '../../views/oauth'; describe('OAuth', () => { @@ -7,7 +6,6 @@ describe('OAuth', () => { before(() => { cy.login(); - guidedTour.close(); cy.exec('oc get oauths cluster -o json').then((result) => { originalOAuthConfig = JSON.parse(result.stdout); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crd-extensions/console-external-log-link.cy.ts b/frontend/packages/integration-tests-cypress/tests/crd-extensions/console-external-log-link.cy.ts index f37f53c3273..7d3f91f4fb5 100644 --- a/frontend/packages/integration-tests-cypress/tests/crd-extensions/console-external-log-link.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crd-extensions/console-external-log-link.cy.ts @@ -2,7 +2,6 @@ import { safeLoad, safeDump } from 'js-yaml'; import * as _ from 'lodash'; import { checkErrors, testName } from '../../support'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { modal } from '../../views/modal'; import * as yamlEditor from '../../views/yaml-editor'; @@ -18,7 +17,6 @@ describe(`${crd} CRD`, () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/add-storage-crud.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/add-storage-crud.cy.ts index 3cb50451fca..e759e6ad7ec 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/add-storage-crud.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/add-storage-crud.cy.ts @@ -3,7 +3,6 @@ import * as _ from 'lodash'; import { testName, checkErrors } from '../../support'; import { detailsPage } from '../../views/details-page'; import { submitButton } from '../../views/form'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import * as yamlEditor from '../../views/yaml-editor'; @@ -21,7 +20,6 @@ const resourceObjs = describe('Add storage is applicable for all workloads', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/annotations.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/annotations.cy.ts index 9515edf9784..5da09a2ca2c 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/annotations.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/annotations.cy.ts @@ -3,7 +3,6 @@ import { defaultsDeep } from 'lodash'; import { checkErrors, testName } from '../../support'; import { projectDropdown } from '../../views/common'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { modal } from '../../views/modal'; import { nav } from '../../views/nav'; @@ -96,7 +95,6 @@ const annotations = [ describe('Annotations', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); createExampleConfigMapInstance(); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/bulk-create-resources.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/bulk-create-resources.cy.ts index 80ffe5f2857..bb8f23522fa 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/bulk-create-resources.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/bulk-create-resources.cy.ts @@ -1,5 +1,4 @@ import { checkErrors, testName } from '../../support'; -import { guidedTour } from '../../views/guided-tour'; import * as yamlEditor from '../../views/yaml-editor'; describe('Bulk import operation', () => { @@ -74,7 +73,6 @@ stringData: before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(namespace); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/customresourcedefinition.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/customresourcedefinition.cy.ts index 97561181a94..002f5983142 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/customresourcedefinition.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/customresourcedefinition.cy.ts @@ -2,7 +2,6 @@ import { safeLoad, safeDump } from 'js-yaml'; import * as _ from 'lodash'; import { CustomResourceDefinitionKind } from '@console/internal/module/k8s'; import { checkErrors, testName } from '../../support'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { modal } from '../../views/modal'; import * as yamlEditor from '../../views/yaml-editor'; @@ -73,7 +72,6 @@ describe('CustomResourceDefinitions', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/environment.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/environment.cy.ts index 4494094ab58..d2949eabefb 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/environment.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/environment.cy.ts @@ -3,7 +3,6 @@ import * as _ from 'lodash'; import { checkErrors, testName } from '../../support'; import { detailsPage } from '../../views/details-page'; import { environment } from '../../views/environment'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import * as yamlEditor from '../../views/yaml-editor'; @@ -12,7 +11,6 @@ const WORKLOAD_NAME = `filter-${testName}`; describe('Interacting with the environment variable editor', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); cy.visit(`/k8s/ns/${testName}/deployments`); listPage.clickCreateYAMLbutton(); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/image-pull-secret.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/image-pull-secret.cy.ts index 7ba4860b15c..c787c7d68ab 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/image-pull-secret.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/image-pull-secret.cy.ts @@ -1,6 +1,5 @@ import { checkErrors, testName } from '../../support'; import { projectDropdown } from '../../views/common'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { nav } from '../../views/nav'; @@ -52,7 +51,6 @@ describe('Create image pull secret', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/namespace-crud.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/namespace-crud.cy.ts index 2802fcfa792..cd84c1119b2 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/namespace-crud.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/namespace-crud.cy.ts @@ -1,7 +1,6 @@ import { checkErrors, testName } from '../../support'; import { projectDropdown } from '../../views/common'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { modal } from '../../views/modal'; import { nav } from '../../views/nav'; @@ -9,7 +8,6 @@ import { nav } from '../../views/nav'; describe('Namespace', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/other-routes.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/other-routes.cy.ts index 1c500f3ff34..4a661ed7dba 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/other-routes.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/other-routes.cy.ts @@ -1,14 +1,12 @@ import { checkDeveloperPerspective } from '@console/dev-console/integration-tests/support/pages/functions/checkDeveloperPerspective'; import { checkErrors } from '../../support'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { nav } from '../../views/nav'; describe('Visiting other routes', () => { before(() => { cy.login(); - guidedTour.close(); }); afterEach(() => { @@ -134,14 +132,12 @@ describe('Visiting other routes', () => { describe('Test perspective query parameters', () => { before(() => { cy.login(); - guidedTour.close(); }); beforeEach(() => { cy.initAdmin(); cy.visit('/k8s/cluster/projects'); listPage.dvRows.shouldBeLoaded(); - guidedTour.close(); checkDeveloperPerspective(); }); @@ -157,12 +153,10 @@ describe('Test perspective query parameters', () => { }, }); nav.sidenav.switcher.shouldHaveText('Developer'); - guidedTour.close(); }); it('tests Administrator query parameter', () => { nav.sidenav.switcher.changePerspectiveTo('Developer'); nav.sidenav.switcher.shouldHaveText('Developer'); - guidedTour.close(); cy.visit('/dashboards', { qs: { perspective: 'admin', diff --git a/frontend/packages/integration-tests-cypress/tests/crud/quotas.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/quotas.cy.ts index 55a535d39d4..e17dc3d3e81 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/quotas.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/quotas.cy.ts @@ -3,7 +3,6 @@ import * as _ from 'lodash'; import { checkErrors, testName } from '../../support'; import { projectDropdown } from '../../views/common'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { modal } from '../../views/modal'; import { nav } from '../../views/nav'; @@ -86,7 +85,6 @@ const deleteClusterExamples = () => { describe('Quotas', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); createExampleQuotas(); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/resource-crud.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/resource-crud.cy.ts index c16b396e8df..4b96d781d30 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/resource-crud.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/resource-crud.cy.ts @@ -4,7 +4,6 @@ import * as _ from 'lodash'; import { testName, editKind, deleteKind, checkErrors } from '../../support'; import { projectDropdown } from '../../views/common'; import { detailsPage, DetailsPageSelector } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage, ListPageSelector } from '../../views/list-page'; import { modal } from '../../views/modal'; import * as yamlEditor from '../../views/yaml-editor'; @@ -20,7 +19,6 @@ type TestDefinition = { describe('Kubernetes resource CRUD operations', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/roles-rolebindings.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/roles-rolebindings.cy.ts index ed5a0a8e94f..e6c72567137 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/roles-rolebindings.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/roles-rolebindings.cy.ts @@ -3,7 +3,6 @@ import * as _ from 'lodash'; import { checkErrors, testName } from '../../support'; import { projectDropdown } from '../../views/common'; import { detailsPage } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { modal } from '../../views/modal'; import { nav } from '../../views/nav'; @@ -105,7 +104,6 @@ const deleteClusterExamples = () => { describe('Roles and RoleBindings', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); createExampleRoles(); createExampleRoleBindings(); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/secrets/add-to-workload.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/secrets/add-to-workload.cy.ts index 831a3c251fb..2530bc3d573 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/secrets/add-to-workload.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/secrets/add-to-workload.cy.ts @@ -1,7 +1,6 @@ import * as _ from 'lodash'; import { DeploymentKind } from '@console/internal/module/k8s'; import { checkErrors, testName } from '../../../support'; -import { guidedTour } from '../../../views/guided-tour'; import { modal } from '../../../views/modal'; import { secrets } from '../../../views/secret'; @@ -44,7 +43,6 @@ const deployment: DeploymentKind = { describe('Add Secret to Workloads', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); cy.exec(`echo '${JSON.stringify(deployment)}' | oc create -n ${testName} -f -`); cy.exec( diff --git a/frontend/packages/integration-tests-cypress/tests/crud/secrets/image-pull.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/secrets/image-pull.cy.ts index d3b336371e3..53fcdd3e1f5 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/secrets/image-pull.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/secrets/image-pull.cy.ts @@ -1,6 +1,5 @@ import { checkErrors, testName } from '../../../support'; import { detailsPage } from '../../../views/details-page'; -import { guidedTour } from '../../../views/guided-tour'; import { secrets } from '../../../views/secret'; const heading = 'Create image pull secret'; @@ -8,7 +7,6 @@ const heading = 'Create image pull secret'; describe('Image pull secrets', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/secrets/key-value.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/secrets/key-value.cy.ts index 5c67dde29ea..bcfd5a3cb4c 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/secrets/key-value.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/secrets/key-value.cy.ts @@ -2,7 +2,6 @@ import 'cypress-file-upload'; import { checkErrors, testName } from '../../../support'; import { detailsPage } from '../../../views/details-page'; -import { guidedTour } from '../../../views/guided-tour'; import { listPage } from '../../../views/list-page'; import { nav } from '../../../views/nav'; import { secrets } from '../../../views/secret'; @@ -34,7 +33,6 @@ describe('Create key/value secrets', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/secrets/source.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/secrets/source.cy.ts index dffb118bdfe..d4c22db22b4 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/secrets/source.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/secrets/source.cy.ts @@ -1,6 +1,5 @@ import { checkErrors, testName } from '../../../support'; import { detailsPage } from '../../../views/details-page'; -import { guidedTour } from '../../../views/guided-tour'; import { secrets } from '../../../views/secret'; describe('Source secrets', () => { @@ -15,7 +14,6 @@ describe('Source secrets', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/crud/secrets/webhook.cy.ts b/frontend/packages/integration-tests-cypress/tests/crud/secrets/webhook.cy.ts index d9fd7e910c2..ede8fae0620 100644 --- a/frontend/packages/integration-tests-cypress/tests/crud/secrets/webhook.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/crud/secrets/webhook.cy.ts @@ -1,6 +1,5 @@ import { checkErrors, testName } from '../../../support'; import { detailsPage } from '../../../views/details-page'; -import { guidedTour } from '../../../views/guided-tour'; import { secrets } from '../../../views/secret'; describe('Webhook secret', () => { @@ -9,7 +8,6 @@ describe('Webhook secret', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/dashboards/cluster-dashboard.cy.ts b/frontend/packages/integration-tests-cypress/tests/dashboards/cluster-dashboard.cy.ts index db70249ce0b..113a1ce593e 100644 --- a/frontend/packages/integration-tests-cypress/tests/dashboards/cluster-dashboard.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/dashboards/cluster-dashboard.cy.ts @@ -1,12 +1,10 @@ import { checkErrors } from '../../support'; import { isLocalDevEnvironment } from '../../views/common'; import { refreshWebConsoleLink } from '../../views/form'; -import { guidedTour } from '../../views/guided-tour'; describe('Cluster dashboard', () => { before(() => { cy.login(); - guidedTour.close(); }); beforeEach(() => { diff --git a/frontend/packages/integration-tests-cypress/tests/dashboards/project-dashboard.cy.ts b/frontend/packages/integration-tests-cypress/tests/dashboards/project-dashboard.cy.ts index ee5b57864b5..081388496cc 100644 --- a/frontend/packages/integration-tests-cypress/tests/dashboards/project-dashboard.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/dashboards/project-dashboard.cy.ts @@ -1,10 +1,8 @@ import { checkErrors, testName } from '../../support'; -import { guidedTour } from '../../views/guided-tour'; describe('Project dashboard', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/integration-tests-cypress/tests/events/events.cy.ts b/frontend/packages/integration-tests-cypress/tests/events/events.cy.ts index 5b102cdfe84..d48836c242b 100644 --- a/frontend/packages/integration-tests-cypress/tests/events/events.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/events/events.cy.ts @@ -1,5 +1,4 @@ import { testName, checkErrors } from '../../support'; -import { guidedTour } from '../../views/guided-tour'; const name = `${testName}-event-test-pod`; const testpod = { @@ -34,7 +33,6 @@ const testpod = { describe('Events', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); try { cy.exec(`echo '${JSON.stringify(testpod)}' | oc create -n ${testName} -f -`); diff --git a/frontend/packages/integration-tests-cypress/tests/favorite/favorite-option.cy.ts b/frontend/packages/integration-tests-cypress/tests/favorite/favorite-option.cy.ts index e31be3905bb..328757b78cf 100644 --- a/frontend/packages/integration-tests-cypress/tests/favorite/favorite-option.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/favorite/favorite-option.cy.ts @@ -1,5 +1,4 @@ import { checkErrors } from '../../support'; -import { guidedTour } from '../../views/guided-tour'; import { nav } from '../../views/nav'; describe('Favorites', () => { @@ -7,7 +6,6 @@ describe('Favorites', () => { // clear any existing sessions Cypress.session.clearAllSavedSessions(); cy.login(); - guidedTour.close(); }); afterEach(() => { diff --git a/frontend/packages/integration-tests-cypress/tests/i18n/pseudolocalization.cy.ts b/frontend/packages/integration-tests-cypress/tests/i18n/pseudolocalization.cy.ts index e269c28e483..a8bdaf68691 100644 --- a/frontend/packages/integration-tests-cypress/tests/i18n/pseudolocalization.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/i18n/pseudolocalization.cy.ts @@ -1,5 +1,4 @@ import { checkErrors } from '../../support'; -import { guidedTour } from '../../views/guided-tour'; import { masthead } from '../../views/masthead'; const url = '/dashboards?pseudolocalization=true&lng=en'; @@ -7,7 +6,6 @@ const url = '/dashboards?pseudolocalization=true&lng=en'; describe('Localization', () => { before(() => { cy.login(); - guidedTour.close(); }); afterEach(() => { diff --git a/frontend/packages/integration-tests-cypress/tests/storage/clone.cy.ts b/frontend/packages/integration-tests-cypress/tests/storage/clone.cy.ts index 2f37edacad7..fc9f8f5e65e 100644 --- a/frontend/packages/integration-tests-cypress/tests/storage/clone.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/storage/clone.cy.ts @@ -2,7 +2,6 @@ import { PVC, PVCGP3, testerDeployment } from '../../mocks/snapshot'; import { testName, checkErrors } from '../../support'; import { resourceStatusShouldContain } from '../../views/common'; import { detailsPage, DetailsPageSelector } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { modal } from '../../views/modal'; import { nav } from '../../views/nav'; @@ -24,7 +23,6 @@ if (Cypress.env('BRIDGE_AWS')) { describe('Clone Tests', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); cy.exec(`echo '${JSON.stringify(PVC)}' | oc apply -n ${testName} -f -`); cy.exec(`echo '${JSON.stringify(PVCGP3)}' | oc apply -n ${testName} -f -`); diff --git a/frontend/packages/integration-tests-cypress/tests/storage/create-storage-class.cy.ts b/frontend/packages/integration-tests-cypress/tests/storage/create-storage-class.cy.ts index 8b36340300f..e1423e88ed7 100644 --- a/frontend/packages/integration-tests-cypress/tests/storage/create-storage-class.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/storage/create-storage-class.cy.ts @@ -1,5 +1,4 @@ import { provisionersMap } from '../../mocks/storage-class'; -import { guidedTour } from '../../views/guided-tour'; import { nav } from '../../views/nav'; import { createStorageClassValidateAndCleanUp, @@ -10,7 +9,6 @@ import { describe('Test creation of Storage classes using various provisioners', () => { before(() => { cy.login(); - guidedTour.close(); nav.sidenav.clickNavLink(['Storage', 'StorageClasses']); }); diff --git a/frontend/packages/integration-tests-cypress/tests/storage/snapshot.cy.ts b/frontend/packages/integration-tests-cypress/tests/storage/snapshot.cy.ts index b3951629c24..a68f4799463 100644 --- a/frontend/packages/integration-tests-cypress/tests/storage/snapshot.cy.ts +++ b/frontend/packages/integration-tests-cypress/tests/storage/snapshot.cy.ts @@ -2,7 +2,6 @@ import { PVC, testerDeployment, SnapshotClass, patchForVolume } from '../../mock import { testName, checkErrors } from '../../support'; import { resourceStatusShouldContain } from '../../views/common'; import { detailsPage, DetailsPageSelector } from '../../views/details-page'; -import { guidedTour } from '../../views/guided-tour'; import { listPage } from '../../views/list-page'; import { modal } from '../../views/modal'; import { nav } from '../../views/nav'; @@ -15,7 +14,6 @@ if (Cypress.env('BRIDGE_AWS')) { describe('Snapshot Tests', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); cy.exec(`echo '${JSON.stringify(PVC)}' | oc apply -n ${testName} -f -`); cy.exec(`echo '${JSON.stringify(testerDeployment)}' | oc apply -n ${testName} -f -`); diff --git a/frontend/packages/integration-tests-cypress/views/guided-tour.ts b/frontend/packages/integration-tests-cypress/views/guided-tour.ts deleted file mode 100644 index d055b76a2af..00000000000 --- a/frontend/packages/integration-tests-cypress/views/guided-tour.ts +++ /dev/null @@ -1,16 +0,0 @@ -export const guidedTour = { - close: () => { - cy.get('body').then(($body) => { - if ($body.find(`[data-test="guided-tour-modal"]`).length > 0) { - cy.byTestID('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.byTestID('guided-tour-modal').should('be.visible'); - } - }); - }, -}; diff --git a/frontend/packages/knative-plugin/integration-tests/cypress.config.js b/frontend/packages/knative-plugin/integration-tests/cypress.config.js index b9b10a847c6..5067a18da7c 100644 --- a/frontend/packages/knative-plugin/integration-tests/cypress.config.js +++ b/frontend/packages/knative-plugin/integration-tests/cypress.config.js @@ -48,5 +48,6 @@ module.exports = defineConfig({ experimentalMemoryManagement: true, numTestsKeptInMemory: 5, injectDocumentDomain: true, + userAgent: 'ConsoleIntegrationTestEnvironment', }, }); diff --git a/frontend/packages/knative-plugin/integration-tests/support/commands/hooks.ts b/frontend/packages/knative-plugin/integration-tests/support/commands/hooks.ts index 55543cb7a3a..32c2c58378a 100644 --- a/frontend/packages/knative-plugin/integration-tests/support/commands/hooks.ts +++ b/frontend/packages/knative-plugin/integration-tests/support/commands/hooks.ts @@ -1,5 +1,4 @@ import { checkErrors } from '@console/cypress-integration-tests/support'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { installKnativeOperatorUsingCLI } from '@console/dev-console/integration-tests/support/pages'; before(() => { @@ -20,7 +19,6 @@ before(() => { } cy.log('uncaught:exception', err, runnable, promise); }); - guidedTour.close(); }); beforeEach(() => { diff --git a/frontend/packages/knative-plugin/integration-tests/support/pages/dev-perspective/common.ts b/frontend/packages/knative-plugin/integration-tests/support/pages/dev-perspective/common.ts index 1e917ecf778..1debfcbb274 100644 --- a/frontend/packages/knative-plugin/integration-tests/support/pages/dev-perspective/common.ts +++ b/frontend/packages/knative-plugin/integration-tests/support/pages/dev-perspective/common.ts @@ -1,4 +1,3 @@ -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { app } from '@console/dev-console/integration-tests/support/pages'; export const userLoginPage = { @@ -16,6 +15,5 @@ export const userLoginPage = { const password = Cypress.env('BRIDGE_HTPASSWD_PASSWORD') || 'test'; cy.login(idp, username, password); app.waitForLoad(); - guidedTour.close(); }, }; diff --git a/frontend/packages/knative-plugin/integration-tests/support/pages/dev-perspective/test-serverless-function-page.ts b/frontend/packages/knative-plugin/integration-tests/support/pages/dev-perspective/test-serverless-function-page.ts index 995fb84276a..525d5824009 100644 --- a/frontend/packages/knative-plugin/integration-tests/support/pages/dev-perspective/test-serverless-function-page.ts +++ b/frontend/packages/knative-plugin/integration-tests/support/pages/dev-perspective/test-serverless-function-page.ts @@ -1,4 +1,3 @@ -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { app } from '@console/dev-console/integration-tests/support/pages'; export const reloadPageUntilWorkloadIsDisplayed = ( @@ -15,7 +14,6 @@ export const reloadPageUntilWorkloadIsDisplayed = ( if (!$el.find(`[aria-label="${workloadName} sub-resources"]`).is(':visible')) { cy.reload(); app.waitForLoad(); - guidedTour.close(); // eslint-disable-next-line cypress/no-unnecessary-waiting cy.wait(5000); reloadPageUntilWorkloadIsDisplayed(workloadName, maxAttempts, attempts + 1); diff --git a/frontend/packages/knative-plugin/integration-tests/support/step-definitions/serverless/actions-on-knative-revision.ts b/frontend/packages/knative-plugin/integration-tests/support/step-definitions/serverless/actions-on-knative-revision.ts index 128f856c1a7..ff55e2eafec 100644 --- a/frontend/packages/knative-plugin/integration-tests/support/step-definitions/serverless/actions-on-knative-revision.ts +++ b/frontend/packages/knative-plugin/integration-tests/support/step-definitions/serverless/actions-on-knative-revision.ts @@ -1,6 +1,5 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'; import { detailsPage } from '@console/cypress-integration-tests/views/details-page'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { modal } from '@console/cypress-integration-tests/views/modal'; import { addOptions, @@ -315,7 +314,6 @@ Then( 'verify the number of annotations equal to {string} in side bar details knative revision', (numOfAnnotations: string) => { cy.reload(); - guidedTour.close(); topologyPage.waitForLoad(); topologySidePane.verify(); topologySidePane.selectTab('Details'); diff --git a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/cypress.config.js b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/cypress.config.js index 7e2054a3663..e9174dfd5e8 100644 --- a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/cypress.config.js +++ b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/cypress.config.js @@ -36,5 +36,6 @@ module.exports = defineConfig({ experimentalMemoryManagement: true, numTestsKeptInMemory: 5, injectDocumentDomain: true, + userAgent: 'ConsoleIntegrationTestEnvironment', }, }); diff --git a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/catalog-source-details.cy.ts b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/catalog-source-details.cy.ts index 0c0e63ecce8..6636ca10a34 100644 --- a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/catalog-source-details.cy.ts +++ b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/catalog-source-details.cy.ts @@ -1,4 +1,3 @@ -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { checkErrors, create, testName } from '../../../integration-tests-cypress/support'; import { detailsPage } from '../../../integration-tests-cypress/views/details-page'; import { modal } from '../../../integration-tests-cypress/views/modal'; @@ -13,7 +12,6 @@ const managedCatalogSource = { describe(`Interacting with CatalogSource page`, () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); create(testCatalogSource); }); diff --git a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/create-namespace.cy.ts b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/create-namespace.cy.ts index c21b9fab335..9863a5571ac 100644 --- a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/create-namespace.cy.ts +++ b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/create-namespace.cy.ts @@ -1,11 +1,9 @@ -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { checkErrors, testName } from '../../../integration-tests-cypress/support'; import { modal } from '../../../integration-tests-cypress/views/modal'; describe('Create namespace from install operators', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/deprecated-operator-warnings.cy.ts b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/deprecated-operator-warnings.cy.ts index 73061308268..2fe48c06b39 100644 --- a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/deprecated-operator-warnings.cy.ts +++ b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/deprecated-operator-warnings.cy.ts @@ -1,4 +1,3 @@ -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { checkErrors, create, testName } from '../../../integration-tests-cypress/support'; import { testDeprecatedCatalogSource, testDeprecatedSubscription } from '../mocks'; import { operator } from '../views/operator.view'; @@ -24,7 +23,6 @@ const DEPRECATED_OPERATOR_WARNING_VERSION_ID = 'deprecated-operator-warning-vers describe('Deprecated operator warnings', () => { before(() => { cy.login(); - guidedTour.close(); // Make test idempotent for local testing by deleting test resources if they exist cy.exec( `oc delete subscription ${testDeprecatedSubscription.metadata.name} -n ${testDeprecatedSubscription.metadata.namespace}`, diff --git a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-hub.cy.ts b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-hub.cy.ts index 5766e8a6b07..2e385a0161b 100644 --- a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-hub.cy.ts +++ b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-hub.cy.ts @@ -1,10 +1,8 @@ -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { checkErrors, testName } from '../../../integration-tests-cypress/support'; describe('Interacting with OperatorHub', () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-install-global.cy.ts b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-install-global.cy.ts index f58c91d21f5..956de6a349e 100644 --- a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-install-global.cy.ts +++ b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-install-global.cy.ts @@ -1,4 +1,3 @@ -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { checkErrors } from '../../../integration-tests-cypress/support'; import { operator, GlobalInstalledNamespace, TestOperandProps } from '../views/operator.view'; @@ -19,7 +18,6 @@ const testOperand: TestOperandProps = { describe(`Globally installing "${testOperator.name}" operator in ${GlobalInstalledNamespace}`, () => { before(() => { cy.login(); - guidedTour.close(); operator.install(testOperator.name, testOperator.operatorHubCardTestID); }); diff --git a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-install-single-namespace.cy.ts b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-install-single-namespace.cy.ts index 2784fb8a324..a8a59e939d4 100644 --- a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-install-single-namespace.cy.ts +++ b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-install-single-namespace.cy.ts @@ -1,5 +1,4 @@ import { projectDropdown } from '@console/cypress-integration-tests/views/common'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { checkErrors, testName } from '../../../integration-tests-cypress/support'; import { nav } from '../../../integration-tests-cypress/views/nav'; import { GlobalInstalledNamespace, operator, TestOperandProps } from '../views/operator.view'; @@ -21,7 +20,6 @@ const testOperand: TestOperandProps = { describe(`Installing "${testOperator.name}" operator in test namespace`, () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); }); diff --git a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-uninstall.cy.ts b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-uninstall.cy.ts index 43cd3180df3..7ae19a531e0 100644 --- a/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-uninstall.cy.ts +++ b/frontend/packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-uninstall.cy.ts @@ -1,5 +1,4 @@ import { submitButton } from '@console/cypress-integration-tests/views/form'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { checkErrors, testName } from '../../../integration-tests-cypress/support'; import { modal } from '../../../integration-tests-cypress/views/modal'; import { operator, TestOperandProps } from '../views/operator.view'; @@ -25,7 +24,6 @@ const alertExists = (titleText: string) => { describe(`Testing uninstall of ${testOperator.name} Operator`, () => { before(() => { cy.login(); - guidedTour.close(); cy.createProjectWithCLI(testName); operator.install( testOperator.name, diff --git a/frontend/packages/shipwright-plugin/integration-tests/cypress.config.js b/frontend/packages/shipwright-plugin/integration-tests/cypress.config.js index cca36d6f9b6..8b78e840534 100644 --- a/frontend/packages/shipwright-plugin/integration-tests/cypress.config.js +++ b/frontend/packages/shipwright-plugin/integration-tests/cypress.config.js @@ -46,5 +46,6 @@ module.exports = defineConfig({ experimentalMemoryManagement: true, numTestsKeptInMemory: 5, injectDocumentDomain: true, + userAgent: 'ConsoleIntegrationTestEnvironment', }, }); diff --git a/frontend/packages/shipwright-plugin/integration-tests/support/commands/hooks.ts b/frontend/packages/shipwright-plugin/integration-tests/support/commands/hooks.ts index 9b74e557e2a..ae8ae4b19f5 100644 --- a/frontend/packages/shipwright-plugin/integration-tests/support/commands/hooks.ts +++ b/frontend/packages/shipwright-plugin/integration-tests/support/commands/hooks.ts @@ -1,4 +1,3 @@ -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { checkDeveloperPerspective } from '@console/dev-console/integration-tests/support/pages/functions/checkDeveloperPerspective'; import { installShipwrightOperatorUsingCLI } from '@console/dev-console/integration-tests/support/pages/functions/installOperatorOnClusterUsingCLI'; @@ -16,7 +15,6 @@ Cypress.on('uncaught:exception', (err, runnable, promise) => { before(() => { cy.exec('../../../../contrib/create-user.sh'); cy.login(); - guidedTour.close(); checkDeveloperPerspective(); installShipwrightOperatorUsingCLI(); }); diff --git a/frontend/packages/shipwright-plugin/integration-tests/support/step-definitions/common/common.ts b/frontend/packages/shipwright-plugin/integration-tests/support/step-definitions/common/common.ts index 92450e8ae29..5d744761b69 100644 --- a/frontend/packages/shipwright-plugin/integration-tests/support/step-definitions/common/common.ts +++ b/frontend/packages/shipwright-plugin/integration-tests/support/step-definitions/common/common.ts @@ -1,6 +1,5 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'; import { detailsPage } from '@console/cypress-integration-tests/views/details-page'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { modal } from '@console/cypress-integration-tests/views/modal'; import { nav } from '@console/cypress-integration-tests/views/nav'; import { @@ -25,7 +24,6 @@ Given('user has logged in as a basic user', () => { const password = Cypress.env('BRIDGE_HTPASSWD_PASSWORD') || 'test'; cy.login(idp, username, password); app.waitForLoad(); - guidedTour.close(); }); Given('user is at developer perspective', () => { @@ -33,7 +31,6 @@ Given('user is at developer perspective', () => { perspective.switchTo(switchPerspective.Developer); // Due to bug ODC-6231 // cy.testA11y('Developer perspective with guide tour modal'); - guidedTour.close(); nav.sidenav.switcher.shouldHaveText(switchPerspective.Developer); // Commenting below line, because it is executing on every test scenario - we will remove this in future releases // cy.testA11y('Developer perspective'); @@ -78,7 +75,6 @@ Given('user is at namespace {string}', (projectName: string) => { When('user switches to developer perspective', () => { perspective.switchTo(switchPerspective.Developer); - guidedTour.close(); }); When('user selects {string} option from Actions menu', (option: string) => { diff --git a/frontend/packages/topology/integration-tests/cypress.config.js b/frontend/packages/topology/integration-tests/cypress.config.js index 5bdeb7b55fe..08ea05f9d03 100644 --- a/frontend/packages/topology/integration-tests/cypress.config.js +++ b/frontend/packages/topology/integration-tests/cypress.config.js @@ -51,5 +51,6 @@ module.exports = defineConfig({ experimentalMemoryManagement: true, numTestsKeptInMemory: 5, injectDocumentDomain: true, + userAgent: 'ConsoleIntegrationTestEnvironment', }, }); diff --git a/frontend/packages/topology/integration-tests/support/commands/hooks.ts b/frontend/packages/topology/integration-tests/support/commands/hooks.ts index bb56842f261..888ea3cf5c0 100644 --- a/frontend/packages/topology/integration-tests/support/commands/hooks.ts +++ b/frontend/packages/topology/integration-tests/support/commands/hooks.ts @@ -1,5 +1,4 @@ import { checkErrors } from '@console/cypress-integration-tests/support'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; /* eslint-disable no-console, promise/catch-or-return */ before(() => { @@ -9,7 +8,6 @@ before(() => { const bridgePasswordPassword: string = Cypress.env('BRIDGE_HTPASSWD_PASSWORD') || 'test'; cy.login(bridgePasswordIDP, bridgePasswordUsername, bridgePasswordPassword); cy.document().its('readyState').should('eq', 'complete'); - guidedTour.close(); }); after(() => { diff --git a/frontend/packages/topology/integration-tests/support/pages/topology/topology-page.ts b/frontend/packages/topology/integration-tests/support/pages/topology/topology-page.ts index 94c79482c52..9caf52f8d21 100644 --- a/frontend/packages/topology/integration-tests/support/pages/topology/topology-page.ts +++ b/frontend/packages/topology/integration-tests/support/pages/topology/topology-page.ts @@ -1,4 +1,3 @@ -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { devNavigationMenu, displayOptions, @@ -349,7 +348,6 @@ export const topologyPage = { clickOnApplicationGroupings: (appName: string) => { cy.reload(); app.waitForLoad(); - guidedTour.close(); cy.get('[data-id="odc-topology-graph"]').click(); const id = `[data-id="group:${appName}"] .odc-resource-icon-application`; cy.log(id); @@ -366,7 +364,6 @@ export const topologyPage = { verifyApplicationGroupingsDeleted: (appName: string) => { cy.reload(); app.waitForLoad(); - guidedTour.close(); const id = `[data-id="group:${appName}"]`; cy.get(id, { timeout: 50000 }).should('not.exist'); }, diff --git a/frontend/packages/topology/integration-tests/support/step-definitions/common/topology.ts b/frontend/packages/topology/integration-tests/support/step-definitions/common/topology.ts index 233b4ef3df1..e4a4af7f681 100644 --- a/frontend/packages/topology/integration-tests/support/step-definitions/common/topology.ts +++ b/frontend/packages/topology/integration-tests/support/step-definitions/common/topology.ts @@ -1,5 +1,4 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { nav } from '@console/cypress-integration-tests/views/nav'; import { switchPerspective, @@ -119,7 +118,6 @@ Then('user is able to see health check notification', () => { Given('user is at developer perspective', () => { checkDeveloperPerspective(); perspective.switchTo(switchPerspective.Developer); - guidedTour.close(); nav.sidenav.switcher.shouldHaveText(switchPerspective.Developer); }); diff --git a/frontend/packages/topology/integration-tests/support/step-definitions/topology/chart-view.ts b/frontend/packages/topology/integration-tests/support/step-definitions/topology/chart-view.ts index df9003f9b9a..568856d5b64 100644 --- a/frontend/packages/topology/integration-tests/support/step-definitions/topology/chart-view.ts +++ b/frontend/packages/topology/integration-tests/support/step-definitions/topology/chart-view.ts @@ -1,5 +1,4 @@ import { When, Then, Given } from 'cypress-cucumber-preprocessor/steps'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { modal } from '@console/cypress-integration-tests/views/modal'; import { nav } from '@console/cypress-integration-tests/views/nav'; import { pageTitle } from '@console/dev-console/integration-tests/support/constants'; @@ -198,7 +197,6 @@ Given('user has installed Service Binding operator', () => { Given('user is at developer perspective', () => { checkDeveloperPerspective(); perspective.switchTo(switchPerspective.Developer); - guidedTour.close(); nav.sidenav.switcher.shouldHaveText(switchPerspective.Developer); }); diff --git a/frontend/packages/topology/integration-tests/support/step-definitions/topology/poddisruptionbdget-warning.ts b/frontend/packages/topology/integration-tests/support/step-definitions/topology/poddisruptionbdget-warning.ts index c6cd7be5cc3..4d78ca1daca 100644 --- a/frontend/packages/topology/integration-tests/support/step-definitions/topology/poddisruptionbdget-warning.ts +++ b/frontend/packages/topology/integration-tests/support/step-definitions/topology/poddisruptionbdget-warning.ts @@ -1,5 +1,4 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { listPage } from '@console/cypress-integration-tests/views/list-page'; import * as yamlView from '@console/cypress-integration-tests/views/yaml-editor'; import { devNavigationMenu } from '@console/dev-console/integration-tests/support/constants'; @@ -29,7 +28,6 @@ When('user navigates to Topology page', () => { When('user clicks on link to view PodDisruptionBudget details', () => { cy.reload(); app.waitForLoad(); - guidedTour.close(); cy.byTestID('pdb-warning').click(); }); diff --git a/frontend/packages/topology/integration-tests/support/step-definitions/topology/resource-quota-warning.ts b/frontend/packages/topology/integration-tests/support/step-definitions/topology/resource-quota-warning.ts index 250582e3f17..5f53cc2fa19 100644 --- a/frontend/packages/topology/integration-tests/support/step-definitions/topology/resource-quota-warning.ts +++ b/frontend/packages/topology/integration-tests/support/step-definitions/topology/resource-quota-warning.ts @@ -1,6 +1,5 @@ import { Given, When, Then, And } from 'cypress-cucumber-preprocessor/steps'; import { detailsPage } from '@console/cypress-integration-tests/views/details-page'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { listPage } from '@console/cypress-integration-tests/views/list-page'; import { modal } from '@console/cypress-integration-tests/views/modal'; import * as yamlView from '@console/cypress-integration-tests/views/yaml-editor'; @@ -48,7 +47,6 @@ When('user navigates to Topology page', () => { When('user clicks on link to view resource quota details', () => { cy.reload(); app.waitForLoad(); - guidedTour.close(); cy.byTestID('resource-quota-warning').click(); }); diff --git a/frontend/packages/topology/integration-tests/support/step-definitions/topology/workload-sidebar.ts b/frontend/packages/topology/integration-tests/support/step-definitions/topology/workload-sidebar.ts index 297f501f295..102f453b130 100644 --- a/frontend/packages/topology/integration-tests/support/step-definitions/topology/workload-sidebar.ts +++ b/frontend/packages/topology/integration-tests/support/step-definitions/topology/workload-sidebar.ts @@ -1,5 +1,4 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { devNavigationMenu, switchPerspective, @@ -175,7 +174,6 @@ Then('user can see traffic details for pod', () => { cy.wait(20000); cy.reload(true); app.waitForLoad(); - guidedTour.close(); cy.get(topologyPO.sidePane.resourcesTab.waitingPods, { timeout: 100000 }).should('not.exist'); perspective.switchTo(switchPerspective.Administrator); perspective.switchTo(switchPerspective.Developer); diff --git a/frontend/packages/webterminal-plugin/integration-tests/cypress.config.js b/frontend/packages/webterminal-plugin/integration-tests/cypress.config.js index df47bb06fdb..57a67312b17 100644 --- a/frontend/packages/webterminal-plugin/integration-tests/cypress.config.js +++ b/frontend/packages/webterminal-plugin/integration-tests/cypress.config.js @@ -48,5 +48,6 @@ module.exports = defineConfig({ experimentalMemoryManagement: true, numTestsKeptInMemory: 5, injectDocumentDomain: true, + userAgent: 'ConsoleIntegrationTestEnvironment', }, }); diff --git a/frontend/packages/webterminal-plugin/integration-tests/support/commands/hooks.ts b/frontend/packages/webterminal-plugin/integration-tests/support/commands/hooks.ts index 02510aa1f07..41e5b3cd5f3 100644 --- a/frontend/packages/webterminal-plugin/integration-tests/support/commands/hooks.ts +++ b/frontend/packages/webterminal-plugin/integration-tests/support/commands/hooks.ts @@ -1,12 +1,10 @@ import { checkErrors } from '@console/cypress-integration-tests/support'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { installWebterminalOperatorUsingCLI } from '@console/dev-console/integration-tests/support/pages'; before(() => { cy.login(); cy.document().its('readyState').should('eq', 'complete'); installWebterminalOperatorUsingCLI(); - guidedTour.close(); }); after(() => { diff --git a/frontend/packages/webterminal-plugin/integration-tests/support/step-definitions/common/webTerminal.ts b/frontend/packages/webterminal-plugin/integration-tests/support/step-definitions/common/webTerminal.ts index bcf46ec9de5..0a0215c8199 100644 --- a/frontend/packages/webterminal-plugin/integration-tests/support/step-definitions/common/webTerminal.ts +++ b/frontend/packages/webterminal-plugin/integration-tests/support/step-definitions/common/webTerminal.ts @@ -1,5 +1,4 @@ import { Given, When, Then, And } from 'cypress-cucumber-preprocessor/steps'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { switchPerspective } from '@console/dev-console/integration-tests/support/constants'; import { perspective } from '@console/dev-console/integration-tests/support/pages'; import { checkDeveloperPerspective } from '@console/dev-console/integration-tests/support/pages/functions/checkDeveloperPerspective'; @@ -72,7 +71,6 @@ And('user has logged in as basic user', () => { cy.login(idp, username, password); // sometimes guide tour is not closed properly without delay cy.wait(1000); - guidedTour.close(); }); Given('user is at developer perspective', () => { diff --git a/frontend/packages/webterminal-plugin/integration-tests/support/step-definitions/web-terminal/web-terminal-adminuser.ts b/frontend/packages/webterminal-plugin/integration-tests/support/step-definitions/web-terminal/web-terminal-adminuser.ts index ac5095656c0..32969f03a15 100644 --- a/frontend/packages/webterminal-plugin/integration-tests/support/step-definitions/web-terminal/web-terminal-adminuser.ts +++ b/frontend/packages/webterminal-plugin/integration-tests/support/step-definitions/web-terminal/web-terminal-adminuser.ts @@ -1,5 +1,4 @@ import { Given, When, Then, And } from 'cypress-cucumber-preprocessor/steps'; -import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour'; import { switchPerspective, devWorkspaceStatuses, @@ -21,7 +20,6 @@ import { webTerminalPage } from '../pages/web-terminal/webTerminal-page'; Given('user has logged in', () => { cy.login(); - guidedTour.close(); }); Given('user has closed existing terminal workspace', () => {