Merge pull request #9452 from jrafanie/enable-cypress-on-push-pr-with-chrome-only

Upgrade cypress to 14.4 and enable it on for PRs with chrome only, for all browsers on manual, push, schedule

Author: Fryguy

.github/workflows/cypress.yaml

@@ -1,6 +1,8 @@
 ---
 name: Cypress
 on:
+  pull_request:
+  push:
   workflow_dispatch:
   schedule:
   - cron: 0 0 * * 0
@@ -37,36 +39,42 @@ jobs:
       TEST_SUITE: spec:cypress
       CYPRESS: true
       CYPRESS_BROWSER: ${{ matrix.cypress-browser }}
+      RUN_CYPRESS: ${{ matrix.cypress-browser == 'chrome' || (matrix.cypress-browser != 'chrome' && github.event_name != 'pull_request') }}
       PGHOST: localhost
       PGPASSWORD: smartvm
     steps:
     - uses: actions/checkout@v4
     - name: Install Edge
       uses: browser-actions/setup-edge@v1
-      if: ${{ matrix.cypress-browser == 'edge' }}
+      if: ${{ matrix.cypress-browser == 'edge' && env.RUN_CYPRESS == 'true' }}
     - name: Set up system
       run: bin/before_install
+      if: ${{ env.RUN_CYPRESS == 'true' }}
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
+      if: ${{ env.RUN_CYPRESS == 'true' }}
       with:
         ruby-version: "${{ matrix.ruby-version }}"
-        bundler-cache: true
+        bundler-cache: 'true'
       timeout-minutes: 30
     - name: Set up Node
       uses: actions/setup-node@v4
+      if: ${{ env.RUN_CYPRESS == 'true' }}
       with:
         node-version: "${{ matrix.node-version }}"
         cache: yarn
     - name: Prepare tests
       run: bin/setup
+      if: ${{ env.RUN_CYPRESS == 'true' }}
       env: # We will be using the development database, so no need for the test database
         SKIP_TEST_RESET: "true"
         SKIP_DATABASE_RESET: "false"
     - name: Run tests
       run: bundle exec rake
+      if: ${{ env.RUN_CYPRESS == 'true' }}
     - name: Save artifacts
       uses: actions/upload-artifact@v4
-      if: failure()
+      if: ${{ failure() && env.RUN_CYPRESS == 'true' }}
       with:
         name: cypress-${{ matrix.cypress-browser }}
         path: |

Rakefile

@@ -89,7 +89,7 @@ namespace :spec do
       # Set the rate limit to a large number to avoid 429: Too Many Requests errors
       # which can occur as cypress very quickly hits a lots of endpoints.
       puts "\n== Removing rate limit =="
-      exit $?.exitstatus unless system("bundle exec rails runner 'MiqServer.my_server.add_settings_for_resource(:server => {:rate_limiting => {:request => {:limit => 99999}}})'")
+      exit $?.exitstatus unless system("bundle exec rails runner 'MiqServer.my_server.add_settings_for_resource(:server => {:rate_limiting => {:request => {:limit => 99999}, :ui_login => {:limit => 99999}}})'")
 
       puts "\n== Starting Rails server =="
       rails_pid = Bundler.with_original_env do

config/webpack/shared.js

@@ -58,8 +58,8 @@ const notShims = (module) => (!SplitChunksPlugin.checkTest(/shims/, module));
 
 let plugins = [
   new webpack.DefinePlugin({
-    // used only by v2v code now
     'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV || 'development'),
+    'process.env.CYPRESS': JSON.stringify(env.CYPRESS),
   }),
 
   new ManifestPlugin({

cypress.config.js

@@ -9,6 +9,18 @@ module.exports = defineConfig({
     viewportWidth: 1800,
     numTestsKeptInMemory: 0,
     videoCompression: false,
+
+    // See: https://docs.cypress.io/app/references/experiments#Experimental-Flake-Detection-Features
+    retries: {
+      experimentalStrategy: 'detect-flake-and-pass-on-threshold',
+      experimentalOptions: {
+        maxRetries: 2,
+        passesRequired: 1,
+      },
+
+      openMode: true,
+      runMode: true,
+    },
     // eslint-disable-next-line no-unused-vars
     setupNodeEvents(on, config) {
       on('after:spec', (spec, results) => {

package.json

@@ -130,7 +130,7 @@
     "core-js": "~3.6.4",
     "core-js-compat": "~3.2.1",
     "css-loader": "~3.4.2",
-    "cypress": "^13.7.1",
+    "cypress": "~14.4.0",
     "duplicate-package-checker-webpack-plugin": "~3.0.0",
     "enhanced-resolve": "~4.0.0",
     "enzyme": "^3.9.0",

yarn.lock

@@ -1412,13 +1412,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@colors/colors@npm:1.5.0":
-  version: 1.5.0
-  resolution: "@colors/colors@npm:1.5.0"
-  checksum: 10/9d226461c1e91e95f067be2bdc5e6f99cfe55a721f45afb44122e23e4b8602eeac4ff7325af6b5a369f36396ee1514d3809af3f57769066d80d83790d8e53339
-  languageName: node
-  linkType: hard
-
 "@csstools/convert-colors@npm:^1.4.0":
   version: 1.4.0
   resolution: "@csstools/convert-colors@npm:1.4.0"
@@ -1433,7 +1426,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cypress/request@npm:^3.0.6":
+"@cypress/request@npm:^3.0.8":
   version: 3.0.8
   resolution: "@cypress/request@npm:3.0.8"
   dependencies:
@@ -4898,7 +4891,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ci-info@npm:^4.0.0":
+"ci-info@npm:^4.1.0":
   version: 4.2.0
   resolution: "ci-info@npm:4.2.0"
   checksum: 10/928d8457f3476ffc4a66dec93b9cdf1944d5e60dba69fbd6a0fc95b652386f6ef64857f6e32372533210ef6d8954634af2c7693d7c07778ee015f3629a5e0dd9
@@ -4964,16 +4957,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-table3@npm:~0.6.1":
-  version: 0.6.5
-  resolution: "cli-table3@npm:0.6.5"
+"cli-table3@npm:0.6.1":
+  version: 0.6.1
+  resolution: "cli-table3@npm:0.6.1"
   dependencies:
-    "@colors/colors": "npm:1.5.0"
+    colors: "npm:1.4.0"
     string-width: "npm:^4.2.0"
   dependenciesMeta:
-    "@colors/colors":
+    colors:
       optional: true
-  checksum: 10/8dca71256f6f1367bab84c33add3f957367c7c43750a9828a4212ebd31b8df76bd7419d386e3391ac7419698a8540c25f1a474584028f35b170841cde2e055c5
+  checksum: 10/eb11ef1264d6e6480eef4d1306f7c9c25800751a40d3eb205f3910ff6e49d067b8b4208e2a17abe57742a57e3c19764a44a68dbf2761bc1f707fdb7b4d658cd9
   languageName: node
   linkType: hard
 
@@ -5122,6 +5115,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"colors@npm:1.4.0":
+  version: 1.4.0
+  resolution: "colors@npm:1.4.0"
+  checksum: 10/90b2d5465159813a3983ea72ca8cff75f784824ad70f2cc2b32c233e95bcfbcda101ebc6d6766bc50f57263792629bfb4f1f8a4dfbd1d240f229fc7f69b785fc
+  languageName: node
+  linkType: hard
+
 "combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8, combined-stream@npm:~1.0.6":
   version: 1.0.8
   resolution: "combined-stream@npm:1.0.8"
@@ -5734,11 +5734,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cypress@npm:^13.7.1":
-  version: 13.17.0
-  resolution: "cypress@npm:13.17.0"
+"cypress@npm:~14.4.0":
+  version: 14.4.0
+  resolution: "cypress@npm:14.4.0"
   dependencies:
-    "@cypress/request": "npm:^3.0.6"
+    "@cypress/request": "npm:^3.0.8"
     "@cypress/xvfb": "npm:^1.2.4"
     "@types/sinonjs__fake-timers": "npm:8.1.1"
     "@types/sizzle": "npm:^2.3.2"
@@ -5749,9 +5749,9 @@ __metadata:
     cachedir: "npm:^2.3.0"
     chalk: "npm:^4.1.0"
     check-more-types: "npm:^2.24.0"
-    ci-info: "npm:^4.0.0"
+    ci-info: "npm:^4.1.0"
     cli-cursor: "npm:^3.1.0"
-    cli-table3: "npm:~0.6.1"
+    cli-table3: "npm:0.6.1"
     commander: "npm:^6.2.1"
     common-tags: "npm:^1.8.0"
     dayjs: "npm:^1.10.4"
@@ -5775,15 +5775,15 @@ __metadata:
     process: "npm:^0.11.10"
     proxy-from-env: "npm:1.0.0"
     request-progress: "npm:^3.0.0"
-    semver: "npm:^7.5.3"
+    semver: "npm:^7.7.1"
     supports-color: "npm:^8.1.1"
     tmp: "npm:~0.2.3"
     tree-kill: "npm:1.2.2"
     untildify: "npm:^4.0.0"
     yauzl: "npm:^2.10.0"
   bin:
     cypress: bin/cypress
-  checksum: 10/6c548e2adf7ae127365570680aa32015dbeb94cad30ce4f8a92e2e58d8ef7033b7f0ece50579a0a13eb07061feede0c813ff8d1e50e0feb87520dece5be4ba95
+  checksum: 10/0fd3197ca611f14e36ad3ae3ae1890b4a2c79719a4125a329f63d2c84dc88284fafad9eb4edc01a9ec2b5a5d558b261734c8c185273495c71aed787c9039ed60
   languageName: node
   linkType: hard
 
@@ -11715,7 +11715,7 @@ __metadata:
     core-js-compat: "npm:~3.2.1"
     create-react-context: "npm:~0.3.0"
     css-loader: "npm:~3.4.2"
-    cypress: "npm:^13.7.1"
+    cypress: "npm:~14.4.0"
     d3: "npm:^7.8.2"
     dompurify: "npm:^3.2.4"
     duplicate-package-checker-webpack-plugin: "npm:~3.0.0"
@@ -15837,7 +15837,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.2.1, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3":
+"semver@npm:^7.2.1, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.7.1":
   version: 7.7.2
   resolution: "semver@npm:7.7.2"
   bin: