CONSOLE-5094: cypress test improvements

README.md

@@ -302,7 +302,7 @@ Examples:
 
 When running in headless mode, Cypress will test using its integrated Electron browser, but if you want to use Chrome or Firefox instead, set `BRIDGE_E2E_BROWSER_NAME` environment variable in your shell with the value `chrome` or `firefox`.
 
-[**_More information on Console's Cypress usage_**](frontend/packages/integration-tests-cypress/README.md)
+[**_More information on Console's Cypress usage_**](frontend/packages/integration-tests/README.md)
 
 [**_More information on DevConsole's Cypress usage_**](frontend/packages/dev-console/integration-tests/README.md)
 
@@ -503,7 +503,7 @@ Currently this feature is behind feature gate.
 
 - [eslint-plugin-console](./frontend/packages/eslint-plugin-console/README.md)
 
-- [integration-tests-cypress](./frontend/packages/integration-tests-cypress/README.md)
+- [integration-tests](./frontend/packages/integration-tests/README.md)
 
 - [knative-plugin](./frontend/packages/knative-plugin/README.md)
 

frontend/integration-tests/test-cypress.sh

@@ -31,7 +31,7 @@ function copyArtifacts {
 
 function generateReport {
   yarn run cypress-postreport
-  if test -f ./packages/integration-tests-cypress/cypress-a11y-report.json; then
+  if test -f ./packages/integration-tests/cypress-a11y-report.json; then
     yarn cypress-a11y-report
   fi
 }

frontend/package.json

@@ -24,10 +24,10 @@
     "gherkin-lint": "./node_modules/.bin/gherkin-lint -c ./packages/dev-console/integration-tests/.gherkin-lintrc ./packages/*/integration-tests/features",
     "test": "LANG=en_US.UTF-8 jest",
     "debug-test": "node --inspect-brk node_modules/.bin/jest --runInBand",
-    "test-cypress-console": "cd packages/integration-tests-cypress && cypress open --env openshift=true",
-    "test-cypress-console-headless": "cd packages/integration-tests-cypress && node --max-old-space-size=4096 ../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron}",
-    "test-cypress-olm": "cd packages/operator-lifecycle-manager/integration-tests-cypress && ../../../node_modules/.bin/cypress open --env openshift=true",
-    "test-cypress-olm-headless": "cd packages/operator-lifecycle-manager/integration-tests-cypress && node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron}",
+    "test-cypress-console": "cd packages/integration-tests && yarn run test-cypress",
+    "test-cypress-console-headless": "cd packages/integration-tests && yarn run test-cypress-headless",
+    "test-cypress-olm": "cd packages/operator-lifecycle-manager/integration-tests && yarn run test-cypress",
+    "test-cypress-olm-headless": "cd packages/operator-lifecycle-manager/integration-tests && yarn run test-cypress-headless",
     "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",
@@ -52,7 +52,7 @@
     "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",
     "cypress-generate": "marge -o ./gui_test_screenshots/ -f cypress-report -t 'OpenShift Console Cypress Test Results' -p 'OpenShift Cypress Test Results' --showPassed false --assetsDir ./gui_test_screenshots/cypress/assets ./gui_test_screenshots/cypress.json",
-    "cypress-a11y-report": "echo '\nA11y Test Results:' && mv packages/integration-tests-cypress/cypress-a11y-report.json ./gui_test_screenshots/ && node -e \"console.table(JSON.parse(require('fs').readFileSync(process.argv[1])));\" ./gui_test_screenshots/cypress-a11y-report.json",
+    "cypress-a11y-report": "echo '\nA11y Test Results:' && mv packages/integration-tests/cypress-a11y-report.json ./gui_test_screenshots/ && node -e \"console.table(JSON.parse(require('fs').readFileSync(process.argv[1])));\" ./gui_test_screenshots/cypress-a11y-report.json",
     "cypress-postreport": "yarn cypress-merge && yarn cypress-generate",
     "analyze": "ANALYZE_BUNDLE=true NODE_ENV=production NODE_OPTIONS=--max-old-space-size=8192 yarn ts-node ./node_modules/.bin/webpack --mode=production",
     "prettier-all": "prettier --write '**/*.{js,jsx,ts,tsx,json}'",
@@ -107,13 +107,11 @@
     "testPathIgnorePatterns": [
       "<rootDir>/node_modules/",
       "<rootDir>/public/dist",
-      "<rootDir>/.*/integration-tests",
-      "<rootDir>/.*/integration-tests-cypress"
+      "<rootDir>/.*/integration-tests"
     ],
     "modulePathIgnorePatterns": [
       "<rootDir>/public/dist",
-      "<rootDir>/.*/integration-tests",
-      "<rootDir>/.*/integration-tests-cypress"
+      "<rootDir>/.*/integration-tests"
     ],
     "testRegex": ".*\\.spec\\.(ts|tsx|js|jsx)$",
     "testEnvironmentOptions": {
@@ -183,7 +181,7 @@
     "file-saver": "1.3.x",
     "formik": "^2.1.5",
     "fuzzysearch": "1.0.x",
-    "gherkin-lint": "^4.1.3",
+    "gherkin-lint": "^4.2.4",
     "git-url-parse": "^11.4.0",
     "graphql": "^14.0.0",
     "history": "^4.9.0",
@@ -272,11 +270,11 @@
     "comment-json": "4.x",
     "copy-webpack-plugin": "^13.0.1",
     "css-loader": "^5.2.7",
-    "cypress": "^14.2.1",
-    "cypress-axe": "^1.6.0",
-    "cypress-cucumber-preprocessor": "latest",
+    "cypress": "^15.10.0",
+    "cypress-axe": "^1.7.0",
+    "cypress-cucumber-preprocessor": "^4.3.1",
     "cypress-jest-adapter": "^0.1.1",
-    "cypress-multi-reporters": "^1.4.0",
+    "cypress-multi-reporters": "^2.0.5",
     "esbuild-loader": "^4.4.2",
     "file-loader": "6.2.0",
     "find-up": "4.x",

frontend/packages/console-telemetry-plugin/integration-tests/features/customization/customization-of-telemetry-analytics.feature

@@ -1,4 +1,4 @@
-@customize-telemetry @odc-7498
+@customize-telemetry @ODC-7498
 Feature: Customization of telemetry analytics
                 As admin you can customize user telemetry analytics.
 
@@ -53,6 +53,3 @@ Feature: Customization of telemetry analytics
               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"
-
-
-

frontend/packages/dev-console/integration-tests/.gherkin-lintrc

@@ -33,18 +33,41 @@
     "@add-flow",
     "@topology",
     "@knative",
+    "@knative-camelK",
+    "@knative-eventing",
+    "@knative-kafka",
+    "@knative-serverless",
     "@guided-tour",
     "@helm",
     "@monitoring",
     "@pipelines",
     "@virtualization",
     "@web-terminal",
     "@vulnerability",
-    "@knative-eventing",
-    "@knative-camelK",
     "@kafka",
-    "@project-access"
-    ]}],
+    "@project-access",
+    "@dev-console",
+    "@build-config",
+    "@common",
+    "@config-maps",
+    "@customize",
+    "@customize-catalogs",
+    "@customize-telemetry",
+    "@customize-web-terminal",
+    "@deployment",
+    "@perspective",
+    "@pod-list",
+    "@route-dev",
+    "@search-page",
+    "@shipwright",
+    "@user-preference"
+  ],
+  "patterns":
+  [
+    "^@ODC-",
+    "^@OCPBUGS-"
+  ]
+  }],
   "no-restricted-tags": ["on", {"tags": ["@watch", "@wip", "@debug"]}],
   "use-and": "off",
   "no-duplicate-tags": "on",

frontend/packages/dev-console/integration-tests/features/addFlow/create-from-docker-file.feature

@@ -46,7 +46,7 @@ Feature: Create Application from Docker file
              Then user will be redirected to Add page
 
 
-        @regression @odc-7614
+        @regression @ODC-7614
         Scenario: Create workload from Dockerfile and verify the Exposed Port in the Target Port section: A-05-TC04
             Given user is on Import from Git form
              When user enters Git Repo URL as "https://github.com/rohitkrai03/flask-dockerfile-example"

frontend/packages/dev-console/integration-tests/features/addFlow/create-from-git.feature

@@ -11,7 +11,7 @@ Feature: Create Application from git form
         # @smoke
         # Marking this scenario as @manual, because due to git-rate limit issue, below scenarios are failing
         # TODO: Use Cypress HTTP mocking to solve the github rate limiting issue. See - https://docs.cypress.io/guides/guides/network-requests
-        @regression @manual @odc-6266
+        @regression @manual @ODC-6266
         Scenario Outline: Add new git workload with new application for resource type "<resource_type>": A-06-TC01
             Given user is at Import from Git form
              When user enters Git Repo URL as "https://github.com/sclorg/dancer-ex.git"
@@ -29,7 +29,7 @@ Feature: Create Application from git form
                   | import-git-1 | DeploymentConfig |
 
 
-        @regression @odc-6266
+        @regression @ODC-6266
         Scenario: Add new git workload to the existing application: A-06-TC02
             Given user has created workload "exist-git" with resource type "Deployment"
               And user is at Add page
@@ -65,7 +65,7 @@ Feature: Create Application from git form
               And public url is not created for node "name-no-route" in the workload sidebar
 
 
-        @regression @odc-6266
+        @regression @ODC-6266
         Scenario: Create a git workload with advanced option "Routing": A-06-TC05
             Given user is at Import from Git form
              When user enters Git Repo URL as "https://github.com/sclorg/dancer-ex.git"
@@ -243,7 +243,7 @@ Feature: Create Application from git form
               And see environment variable "NPM_RUN" with value "build2" in Environment tab of details page
 
 
-        @regression @odc-6303 @broken-test
+        @regression @ODC-6303 @broken-test
         Scenario: Checking Secure Route option in import form: A-06-TC17
             Given user is at Import from Git form
              When user enters Git Repo URL as "https://github.com/sclorg/nodejs-ex.git"
@@ -254,14 +254,14 @@ Feature: Create Application from git form
               And user is able to see Redirect value is selected in "Insecure traffic"
 
 
-        @regression @ocp-43404
+        @regression @OCPBUGS-14067
         Scenario: Disable devfile import strategy for git type - other: A-06-TC18
             Given user is at Import from Git form
              When user enters Git Repo URL as "https://mysupersecretgit.example.com/org/repo"
              Then devfile import strategy is disabled
 
 
-        @regression @ocp-43404
+        @regression @OCPBUGS-14067
         Scenario: When devfile path is not detected: A-06-TC19
             Given user is at Import from Git form
              When user enters Git Repo URL as "https://github.com/nodeshift-starters/devfile-sample"
@@ -270,7 +270,7 @@ Feature: Create Application from git form
              Then user see message "Devfile not detected"
 
 
-        @regression @odc-7613
+        @regression @ODC-7613
         Scenario: Create a git workload when Git Type is not auto-detected: A-06-TC20
             Given user is at Import from Git form
              When user enters Git Repo URL as "https://open-bitbucket.nrao.edu/projects/PIPE/repos/pipeline/browse"

frontend/packages/dev-console/integration-tests/features/addFlow/create-operator-backed.feature

@@ -43,4 +43,4 @@ Feature: Create workload from Operator Backed file
               And user enters name as "jaeger-all-in-one-inmemory1" in Create Jaeger page
               And user clicks create button in Create Jaeger page
              Then user will be redirected to Topology page
-              And user is able to see "jaeger-all-in-one-inmemory1" in Topology page
+              And user is able to see "jaeger-all-in-one-inmemory1" in Topology page

frontend/packages/dev-console/integration-tests/features/addFlow/export-application.feature

@@ -1,4 +1,4 @@
-@add-flow @dev-console @odc-6684
+@add-flow @dev-console @ODC-6684
 Feature: Export of application from the Add page
               As a user, I have an unmanaged application which I want to export. I'd like to be able to later add that code to git or some shared location so that I can share with others, or import into a new cluster or same cluster but different project, or be able to apply updates to an existing application.
 
@@ -21,13 +21,12 @@ Feature: Export of application from the Add page
               And user can see a toast message saying "All the resources are exported successfully from aut-export-application. Click below to download it." with download option and close button
               And user navigates to Topology page
               And user can see primer deployment created in topology
-        
-        
+
+
         @regression
         Scenario: Export Application modal when export application is in progress: A-14-TC02
             Given user is at Add page
              When user clicks on Export Application option
               And user clicks on Ok button on Export Application modal to start the export
               And user clicks on Export Application option again
              Then user can see "View logs" link, "Cancel Export", "Restart Export", and "Ok" button
-

frontend/packages/dev-console/integration-tests/features/addFlow/helm-chart-repositories.feature

@@ -1,5 +1,5 @@
-@add-flow @dev-console @odc-6452
-Feature: Install the Helm Release
+@add-flow @dev-console @ODC-6452
+Feature: Helm Chart Repositories
               As a user, I want to install project helm repository
 
 
@@ -40,9 +40,9 @@ Feature: Install the Helm Release
               And user enters URL as "https://raw.githubusercontent.com/IBM/charts/master/repo/community/index.yaml"
               And user clicks on Create button
              Then user can see "helm-test1" for resource "helm-test1" and type "projecthelmchartrepository" under Chart Repositories in Helm Charts catalog page
-        
+
         # Marking this scenario as @broken-test, because scenario is failing due to change of UI in catalog page
-        @regression  @odc-6685 @broken-test
+        @regression @ODC-6685 @broken-test
         Scenario: Add namespaced helm chart repository with a display name: A-12-TC05
             Given user is at Create Helm Chart Repository page
              When user enters Chart repository name as "helm-test1"
@@ -51,7 +51,7 @@ Feature: Install the Helm Release
               And user enters URL as "https://raw.githubusercontent.com/IBM/charts/master/repo/community/index.yaml"
               And user clicks on Create button
              Then user can see "My Helm Charts" for resource "helm-test1" and type "projecthelmchartrepository" under Chart Repositories in Helm Charts catalog page
-        
+
         # Marking this scenario as @broken-test, because scenario is failing due to change of UI in catalog page
         @regression @broken-test
         Scenario: Add cluster-scoped helm chart repository using a form: A-12-TC06

frontend/packages/dev-console/integration-tests/features/addFlow/in-cluster-gitea.feature

@@ -7,8 +7,8 @@ Feature: Create Application from git form with repositories from In cluster Gite
               And user is at developer perspective
               And user has created or selected namespace "aut-addflow-gitea"
               And user is at Add page
-        
-        @regression @odc-7581
+
+        @regression @ODC-7581
         Scenario Outline: Add new gitea workload with new application for resource type "<resource_type>": A-06-TC01
             Given user is at Import from Git form
              When user enters Gitea Repo Name as "nodejs"
@@ -26,7 +26,7 @@ Feature: Create Application from git form with repositories from In cluster Gite
                   | import-git | Deployment    |
 
 
-        @regression @odc-7581
+        @regression @ODC-7581
         Scenario Outline: Create a workload from Docker file with "<resource_type>" as resource type: A-05-TC02
             Given user is at Import from Git form
              When user enters Gitea Repo Name as "dockerfile-node"
@@ -39,4 +39,4 @@ Feature: Create Application from git form with repositories from In cluster Gite
 
         Examples:
                   | resource_type | name       |
-                  | Deployment    | dockerfile |
+                  | Deployment    | dockerfile |

frontend/packages/dev-console/integration-tests/features/addFlow/quick-search-add.feature

@@ -1,4 +1,4 @@
-@add-flow @dev-console @odc-6303
+@add-flow @dev-console @ODC-6303
 Feature: Provide quick search in Add page
               As a user, I should be able to have a quick way to search for items to add to my application/project in the Add page
 
@@ -57,7 +57,7 @@ Feature: Provide quick search in Add page
              Then user is taken to the Topology page with "devfile-sample-git" workload created
 
 
-        @regression @odc-6467
+        @regression @ODC-6467
         Scenario: Bindable resource in Quick Add: A-11-TC07
             Given user has installed Service Binding operator
               And user has installed Crunchy Postgres for Kubernetes operator

frontend/packages/dev-console/integration-tests/features/addFlow/resource-quota-warning.feature

@@ -1,4 +1,4 @@
-@add-flow @dev-console @ODC6771
+@add-flow @dev-console @ODC-6771
 Feature: Update user in Add page if Quotas has been reached in a namespace
               If any resource reached resource quota limit, a warning alert will be displayed for the user in Add page.
 
@@ -14,13 +14,12 @@ Feature: Update user in Add page if Quotas has been reached in a namespace
               And user navigates to Add page
               And user clicks on link to view resource quota details
              Then user is redirected to resource quota details page
-        
-        
+
+
         @regression
         Scenario: multiple resources reached quota: A-15-TC02
             Given user has created workload with resource type deployment
               And user has created two resource quotas using 'testData/resource-quota/resource-quota.yaml' file
              When user navigates to Add page
               And user clicks on link to view resource quota details
              Then user is redirected to resource quota list page
-

frontend/packages/dev-console/integration-tests/features/addFlow/sharing.feature

@@ -1,4 +1,4 @@
-@add-flow @dev-console @odc-6452
+@add-flow @dev-console @ODC-6452
 Feature: Project Access page
               As a user, I want to access project access page through Add page
 

frontend/packages/dev-console/integration-tests/features/build-config/edit-build-config.feature

@@ -85,7 +85,6 @@ Feature: Form based edit for Build Configs
         Examples:
                   | name | value |
                   | path | /home |
-
 
         @regression @manual
         Scenario Outline: Edit a build which uses strategy Source and Binary as source: EBC-01-TC07

frontend/packages/dev-console/integration-tests/features/customization/customization-of-pinned-resource.feature

@@ -1,4 +1,4 @@
-@customize @dev-console @odc-5012
+@customize @dev-console @ODC-5012
 Feature: Customization of pre-pinned resources
               Allows cluster admins to define pre-pinned resources for new users and users who have not customized their navigation items.
 

frontend/packages/dev-console/integration-tests/features/deployment/deployment-dev-perspective.feature

@@ -49,7 +49,6 @@ Feature: Deployment form view
               And user clicks on the workload "<deployment_name>" to open the sidebar
               And user clicks Edit Deployment from the action menu
              Then user sees auto deploy option is checked
-
 
         Examples:
                   | deployment_name | imagestream_id |

frontend/packages/dev-console/integration-tests/features/e2e/add-flow-ci.feature

@@ -67,7 +67,7 @@ Feature: Create the different workloads from Add page
                   | image_stream | runtime_icon | name           |
                   | golang       | fedora       | hello-internal |
 
-        @regression @odc-7803
+        @regression @ODC-7803
         Scenario Outline: Deploy image with custom icon
             Given user is at Deploy Image page
              When user enters Image name from external registry as "<image_name>"

frontend/packages/dev-console/integration-tests/features/getting-started/getting-started-tour-dev-perspective.feature

@@ -3,7 +3,7 @@
 Feature: Getting Started tour of developer perspective
               As a user I want to take tour of developer perspective
 
-        @regression @manual
+        @regression
         Scenario: Quick tour when user logs in for the first time: GS-02-TC01
             Given user is on login page for the first time
              When user enters the credential