diff --git a/frontend/package.json b/frontend/package.json index 1b887f0f15a..97d4e5f9f7b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -31,9 +31,6 @@ "test-cypress-dev-console": "cd packages/dev-console/integration-tests && yarn run test-cypress", "test-cypress-dev-console-headless": "cd packages/dev-console/integration-tests && yarn run test-cypress-headless", "test-cypress-dev-console-nightly": "cd packages/dev-console/integration-tests && yarn run test-cypress-nightly", - "test-cypress-telemetry-headless": "cd packages/console-telemetry-plugin/integration-tests && yarn run test-cypress-headless", - "test-cypress-telemetry-nightly": "cd packages/console-telemetry-plugin/integration-tests && yarn run test-cypress-headless-all", - "test-cypress-telemetry": "cd packages/console-telemetry-plugin/integration-tests && yarn run test-cypress", "test-cypress-knative": "cd packages/knative-plugin/integration-tests && yarn run test-cypress", "test-cypress-knative-headless": "cd packages/knative-plugin/integration-tests && yarn run test-cypress-headless", "test-cypress-knative-nightly": "cd packages/knative-plugin/integration-tests && yarn run test-cypress-headless-all", @@ -47,7 +44,7 @@ "test-playwright-headed": "playwright test --headed", "test-playwright-debug": "playwright test --debug", "test-playwright-ui": "playwright test --ui", - "test-playwright-admin": "playwright test --project=smoke --project=console --project=dev-console --project=helm --project=knative --project=olm --project=telemetry --project=topology --project=webterminal", + "test-playwright-admin": "playwright test --project=smoke --project=console --project=dev-console --project=helm --project=knative --project=olm --project=topology --project=webterminal", "test-playwright-developer": "playwright test --project=dev-console-developer --project=topology-developer --project=smoke-developer", "test-puppeteer-csp": "yarn ts-node ./test-puppeteer-csp.ts", "cypress-merge": "mochawesome-merge ./gui_test_screenshots/cypress_report*.json > ./gui_test_screenshots/cypress.json", diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/.eslintrc b/frontend/packages/console-telemetry-plugin/integration-tests/.eslintrc deleted file mode 100644 index 5768e567162..00000000000 --- a/frontend/packages/console-telemetry-plugin/integration-tests/.eslintrc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "env": { - "cypress/globals": true, - "node": true - }, - "extends": ["../../.eslintrc", "plugin:cypress/recommended", "plugin:prettier/recommended"], - "plugins": ["cypress"], - "rules": { - "no-console": "off", - "no-namespace": "off", - "no-redeclare": "off", - "promise/catch-or-return": "off", - "promise/no-nesting": "off", - "cypress/no-unnecessary-waiting": "off", - "cypress/unsafe-to-chain-command": "off" - } -} diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/cypress.config.js b/frontend/packages/console-telemetry-plugin/integration-tests/cypress.config.js deleted file mode 100644 index 69f113b5621..00000000000 --- a/frontend/packages/console-telemetry-plugin/integration-tests/cypress.config.js +++ /dev/null @@ -1,14 +0,0 @@ -const { defineConfig } = require('@console/cypress-integration-tests/cypress-common-config'); - -module.exports = defineConfig({ - fixturesFolder: 'testData', - env: { - TAGS: - '(@telemetry or @customize-telemetry) and (@smoke or @regression or @pre-condition) and not (@manual or @to-do or @un-verified or @broken-test)', - NAMESPACE: 'aut-telemetry', - }, - e2e: { - specPattern: 'features/**/*.{feature,features}', - supportFile: 'support/commands/index.ts', - }, -}); diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/features/customization/customization-of-telemetry-analytics.feature b/frontend/packages/console-telemetry-plugin/integration-tests/features/customization/customization-of-telemetry-analytics.feature deleted file mode 100644 index 4857e119069..00000000000 --- a/frontend/packages/console-telemetry-plugin/integration-tests/features/customization/customization-of-telemetry-analytics.feature +++ /dev/null @@ -1,55 +0,0 @@ -@customize-telemetry @ODC-7498 -Feature: Customization of telemetry analytics - As admin you can customize user telemetry analytics. - - Background: - Given user is at developer perspective - And user has created or selected namespace "aut-telemetry" - - @smoke - Scenario: When navigates to cluster configuration page: TE-01-TC01 - Given user is at Consoles page - When user navigates to Cluster configuration page - And user clicks on Telemetry tab - And user clicks on Analytics dropdown - Then user should see Opt-in, Opt-out, Enforce and Disabled options - - - @smoke - Scenario: When user select a option for telemetry analytics in cluster configuration page: TE-01-TC02 - Given user is at Telemetry Configuration page - When user clicks on Analytics dropdown - And user selects "Enforce" option in dropdown menu - Then user should see a success alert - - @regression @manual - Scenario: When user select Opt-in for telemetry analytics in cluster configuration page: TE-01-TC03 - Given user is at Telemetry Configuration page - When user clicks on Analytics dropdown - And user selects "Opt-in" option in dropdown menu - And user is at cluster YAML of "operator.openshift.io/v1" console - Then user should see "telemetry.console.openshift.io/STATE: OPT-IN" got added in "metadata.annotations" - - @regression @manual - Scenario: When user select Opt-out for telemetry analytics in cluster configuration page: TE-01-TC04 - Given user is at Telemetry Configuration page - When user clicks on Analytics dropdown - And user selects "Opt-out" option in dropdown menu - And user is at cluster YAML of "operator.openshift.io/v1" console - Then user should see "telemetry.console.openshift.io/STATE: OPT-OUT" got added in "metadata.annotations" - - @regression @manual - Scenario: When user select Enforce for telemetry analytics in cluster configuration page: TE-01-TC05 - Given user is at Telemetry Configuration page - When user clicks on Analytics dropdown - And user selects "Enforce" option in dropdown menu - And user is at cluster YAML of "operator.openshift.io/v1" console - Then user should see "telemetry.console.openshift.io/STATE: ENFORCE" got added in "metadata.annotations" - - @regression @manual - Scenario: When user select Disabled for telemetry analytics in cluster configuration page: TE-01-TC06 - Given user is at Telemetry Configuration page - When user clicks on Analytics dropdown - And user selects "Disabled" option in dropdown menu - And user is at cluster YAML of "operator.openshift.io/v1" console - Then user should see "telemetry.console.openshift.io/STATE: DISABLED" got added in "metadata.annotations" diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/package.json b/frontend/packages/console-telemetry-plugin/integration-tests/package.json deleted file mode 100644 index 8a5704c4c18..00000000000 --- a/frontend/packages/console-telemetry-plugin/integration-tests/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "@console-telemetry-plugin/integration-tests", - "version": "0.0.1", - "description": "Telemetry Cypress tests", - "private": true, - "cypress-cucumber-preprocessor": { - "step_definitions": "support/step-definitions/*/" - }, - "scripts": { - "test-cypress": "../../../node_modules/.bin/cypress open --env openshift=true", - "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run ${CYPRESS_RECORD_KEY:+--record} --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/*/*.feature\"", - "test-cypress-headless-all": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/*/*.feature\";" - } -} diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/reporter-config.json b/frontend/packages/console-telemetry-plugin/integration-tests/reporter-config.json deleted file mode 100644 index cfcfa34525b..00000000000 --- a/frontend/packages/console-telemetry-plugin/integration-tests/reporter-config.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "reporterEnabled": "mocha-junit-reporter, mochawesome", - "mochaJunitReporterReporterOptions": { - "mochaFile": "../../../gui_test_screenshots/junit_cypress-[hash].xml", - "toConsole": false - }, - "mochawesomeReporterOptions": { - "reportDir": "../../../gui_test_screenshots/", - "reportFilename": "cypress_report_telemetry_analytics", - "overwrite": false, - "html": false, - "json": true - } -} 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 deleted file mode 100644 index 1b17fa90eb1..00000000000 --- a/frontend/packages/console-telemetry-plugin/integration-tests/support/commands/hooks.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* eslint-disable no-console, promise/catch-or-return */ -before(() => { - cy.login(); - cy.document().its('readyState').should('eq', 'complete'); -}); - -after(() => { - const namespaces: string[] = Cypress.expose('NAMESPACES') || []; - cy.exec(`oc delete namespace ${namespaces.join(' ')}`, { - failOnNonZeroExit: false, - timeout: 180000, - }); -}); diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/support/commands/index.ts b/frontend/packages/console-telemetry-plugin/integration-tests/support/commands/index.ts deleted file mode 100644 index 58f43820ae0..00000000000 --- a/frontend/packages/console-telemetry-plugin/integration-tests/support/commands/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Include the cypress customized commands related files -import '@console/cypress-integration-tests/support/selectors'; -import '@console/cypress-integration-tests/support/a11y'; -import '@console/cypress-integration-tests/support/login'; -import '@console/cypress-integration-tests/support/project'; -import '@console/cypress-integration-tests/support'; -import '@console/dev-console/integration-tests/support/commands/app'; -import './hooks'; diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/support/pages/functions/telemetryConfiguration.ts b/frontend/packages/console-telemetry-plugin/integration-tests/support/pages/functions/telemetryConfiguration.ts deleted file mode 100644 index 2cfbe3f472b..00000000000 --- a/frontend/packages/console-telemetry-plugin/integration-tests/support/pages/functions/telemetryConfiguration.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { devNavigationMenu } from '@console/dev-console/integration-tests/support/constants'; -import { navigateTo } from '@console/dev-console/integration-tests/support/pages/app'; - -export const telemetryConfiguration = () => { - navigateTo(devNavigationMenu.Consoles); - cy.byLegacyTestID('actions-menu-button').should('be.visible').click(); - cy.byTestActionID('Customize').should('be.visible').click(); - cy.wait(5000); - cy.get('[role="presentation"]').contains('Telemetry').should('be.visible').click(); -}; diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/support/step-definitions/common/telemetryAnalytics.ts b/frontend/packages/console-telemetry-plugin/integration-tests/support/step-definitions/common/telemetryAnalytics.ts deleted file mode 100644 index 1fb7d4c614e..00000000000 --- a/frontend/packages/console-telemetry-plugin/integration-tests/support/step-definitions/common/telemetryAnalytics.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Given } from 'cypress-cucumber-preprocessor/steps'; -import { projectNameSpace } from '@console/dev-console/integration-tests/support/pages'; -import { checkDeveloperPerspective } from '@console/dev-console/integration-tests/support/pages/functions/checkDeveloperPerspective'; - -Given('user is at developer perspective', () => { - checkDeveloperPerspective(); -}); - -Given('user has created or selected namespace {string}', (projectName: string) => { - Cypress.expose('NAMESPACE', projectName); - projectNameSpace.selectOrCreateProject(`${projectName}`); -}); diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/support/step-definitions/customization/customization-of-telemetry-analytics.ts b/frontend/packages/console-telemetry-plugin/integration-tests/support/step-definitions/customization/customization-of-telemetry-analytics.ts deleted file mode 100644 index 91aec18c284..00000000000 --- a/frontend/packages/console-telemetry-plugin/integration-tests/support/step-definitions/customization/customization-of-telemetry-analytics.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { Given, Then, When } from 'cypress-cucumber-preprocessor/steps'; -import { devNavigationMenu } from '@console/dev-console/integration-tests/support/constants'; -import { navigateTo } from '@console/dev-console/integration-tests/support/pages'; -import { telemetryConfiguration } from '../../pages/functions/telemetryConfiguration'; - -Given('user is at Consoles page', () => { - navigateTo(devNavigationMenu.Consoles); -}); - -When('user clicks on Telemetry tab', () => { - cy.get('[role="presentation"]').contains('Telemetry').should('be.visible').click(); -}); - -Then('user should see Telemetry Configuration page', () => { - cy.byTestID('telemetry form-section').should('be.visible'); -}); - -Given('user is at Telemetry Configuration page', () => { - telemetryConfiguration(); -}); - -When('user clicks on Analytics dropdown', () => { - cy.byTestID('telemetry-dropdown').click(); -}); - -Then('user should see Opt-in, Opt-out, Enforce and Disabled options', () => { - cy.get('[role="presentation"]').contains('Opt-in').should('be.visible'); - cy.get('[role="presentation"]').contains('Opt-out').should('be.visible'); - cy.get('[role="presentation"]').contains('Enforce').should('be.visible'); - cy.get('[role="presentation"]').contains('Disabled').should('be.visible'); -}); - -Then('user should see a success alert', () => { - cy.byTestID('success-alert').should('be.visible'); -}); - -When('user navigates to Cluster configuration page', () => { - cy.byLegacyTestID('actions-menu-button').should('be.visible').click(); - cy.byTestActionID('Customize').should('be.visible').click(); -}); - -When('user selects {string} option in dropdown menu', (value: string) => { - cy.byTestID(`telemetry-dropdown-option-${value}`).click(); -}); diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/tsconfig.json b/frontend/packages/console-telemetry-plugin/integration-tests/tsconfig.json deleted file mode 100644 index e3f5737b750..00000000000 --- a/frontend/packages/console-telemetry-plugin/integration-tests/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../dev-console/integration-tests/tsconfig.json", - "include": ["**/*.ts", "./support/commands/index.ts"], - "paths": { - "pages/*":["support/pages/*"], - "page-objects/*": ["support/pageObjects/*"], - "constants/*": ["support/constants/*"] - } -} diff --git a/frontend/playwright.config.ts b/frontend/playwright.config.ts index 528e62a63a8..117b37ac9be 100644 --- a/frontend/playwright.config.ts +++ b/frontend/playwright.config.ts @@ -22,7 +22,6 @@ const packages = [ 'helm', 'knative', 'olm', - 'telemetry', 'topology', 'webterminal', ]; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 1e2eaf37848..b3b2f469739 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1537,12 +1537,6 @@ __metadata: languageName: node linkType: hard -"@console-telemetry-plugin/integration-tests@workspace:packages/console-telemetry-plugin/integration-tests": - version: 0.0.0-use.local - resolution: "@console-telemetry-plugin/integration-tests@workspace:packages/console-telemetry-plugin/integration-tests" - languageName: unknown - linkType: soft - "@console/app@workspace:packages/console-app": version: 0.0.0-use.local resolution: "@console/app@workspace:packages/console-app"