Bump cypress and @knapsack-pro/cypress (#18025)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Suzanne Aitchison <suzanne@forem.com>

.travis.yml

@@ -91,7 +91,7 @@ jobs:
       env:
         - KNAPSACK_PRO_CI_NODE_TOTAL=3
         - KNAPSACK_PRO_CI_NODE_INDEX=0
-        - KNAPSACK_PRO_TEST_FILE_PATTERN="cypress/integration/seededFlows/**/*.spec.js"
+        - KNAPSACK_PRO_TEST_FILE_PATTERN="cypress/e2e/seededFlows/**/*.spec.js"
       script:
         - bundle exec rails db:create db:schema:load assets:precompile
         - yarn cypress install
@@ -101,7 +101,7 @@ jobs:
       env:
         - KNAPSACK_PRO_CI_NODE_TOTAL=3
         - KNAPSACK_PRO_CI_NODE_INDEX=1
-        - KNAPSACK_PRO_TEST_FILE_PATTERN="cypress/integration/seededFlows/**/*.spec.js"
+        - KNAPSACK_PRO_TEST_FILE_PATTERN="cypress/e2e/seededFlows/**/*.spec.js"
       script:
         - bundle exec rails db:create db:schema:load assets:precompile
         - yarn cypress install
@@ -111,7 +111,7 @@ jobs:
       env:
         - KNAPSACK_PRO_CI_NODE_TOTAL=3
         - KNAPSACK_PRO_CI_NODE_INDEX=2
-        - KNAPSACK_PRO_TEST_FILE_PATTERN="cypress/integration/seededFlows/**/*.spec.js"
+        - KNAPSACK_PRO_TEST_FILE_PATTERN="cypress/e2e/seededFlows/**/*.spec.js"
       script:
         - bundle exec rails db:create db:schema:load assets:precompile
         - yarn cypress install

bin/e2e

@@ -32,7 +32,7 @@ bundle exec rails assets:precompile;
 
 if [ "$1" = "--creator-onboarding-seed" ]; then
    echo "Running E2E tests with creator onboarding seed data"
-   CYPRESS_RAILS_CYPRESS_OPTS="--config-file cypress.dev.json" RAILS_ENV=test E2E=true CREATOR_ONBOARDING_SEED_DATA=1 E2E_FOLDER=creatorOnboardingFlows bundle exec rake cypress:open
+   CYPRESS_RAILS_CYPRESS_OPTS="--config-file cypress.dev.config.js --e2e" RAILS_ENV=test E2E=true CREATOR_ONBOARDING_SEED_DATA=1 E2E_FOLDER=creatorOnboardingFlows bundle exec rake cypress:open
 else
-   CYPRESS_RAILS_CYPRESS_OPTS="--config-file cypress.dev.json" RAILS_ENV=test E2E=true bundle exec rake cypress:open
+   CYPRESS_RAILS_CYPRESS_OPTS="--config-file cypress.dev.config.js --e2e" RAILS_ENV=test E2E=true bundle exec rake cypress:open 
 fi

cypress.config.js

@@ -0,0 +1,14 @@
+/* eslint-env node */
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  e2e: {
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config);
+    },
+    screenshotsFolder: 'tmp/cypress_screenshots',
+    trashAssetsBeforeRuns: false,
+    video: false,
+    retries: 3,
+  },
+});

cypress.dev.config.js

@@ -0,0 +1,13 @@
+/* eslint-env node */
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config);
+    },
+    specPattern: 'cypress/e2e/**/seededFlows/**/*.spec.js',
+  },
+});

cypress.dev.json

@@ -1 +0,0 @@
-{}

cypress.json

@@ -1,6 +0,0 @@
-{
-  "screenshotsFolder": "tmp/cypress_screenshots",
-  "trashAssetsBeforeRuns": false,
-  "video": false,
-  "retries": 3
-}

cypress/e2e/seededFlows/adminFlows/config/authenticationSection.spec.js

@@ -41,7 +41,7 @@ describe('Authentication Section', () => {
             );
           });
 
-          // The page doesn't automatically reload on submission, 
+          // The page doesn't automatically reload on submission,
           // so we reload manually to check the settings have been persisted
           cy.reload();