Merge remote-tracking branch 'origin/10.0.0' into renovate/cypress-12.x

Author: mjhenkes

README.md

@@ -81,18 +81,18 @@ Full code coverage is not the guarantee of exceptional quality. For example, the
 
 ## Smoke tests
 
-As an example, there is a reusable smoke test [cypress/integration/smoke.js](cypress/integration/smoke.js) that goes through the most important parts of the app, covering 84% of the source code. This test can be reused from other tests, for example from [cypress/integration/smoke-spec.js](cypress/integration/smoke-spec.js), that can be executed after deploy for example by using [cypress-smoke.json](cypress-smoke.json) config file
+As an example, there is a reusable smoke test [cypress/integration/smoke.js](cypress/integration/smoke.js) that goes through the most important parts of the app, covering 84% of the source code. This test can be reused from other tests, for example from [cypress/integration/smoke-spec.js](cypress/integration/smoke-spec.js), that can be executed after deploy for example by using [cypress.config.smoke.js](cypress.config.smoke.js) config file
 
 ```shell
-npx cypress run --config-file cypress-smoke.json
+npx cypress run --config-file cypress.config.smoke.js
 ```
 
 ## Component tests
 
 Unit (individual JS functions) and component tests (React components) can be run without any server. There is no need to set anything up, this project works right out of the box without any additional steps, except you need to add `import 'cypress-react-unit-test'` to your Cypress [`supportFile`](https://on.cypress.io/configuration#Folders-Files).
 
 ```shell
-$ npx cypress open --config-file cypress-unit.json
+$ npx cypress open --config-file cypress.config.unit.js
 ```
 
 These tests leave alongside Jest tests in [src](src) folder and are named `*.cy-spec.js`. Implemented using [cypress-react-unit-test](https://github.com/bahmutov/cypress-react-unit-test).

circle.yml

@@ -3,33 +3,6 @@ version: 2.1
 orbs:
   cypress: cypress-io/cypress@2
 workflows:
-  # a separate workflow to confirm
-  # an older version of Cypress still works
-  test-previous-cypress:
-    jobs:
-      - cypress/run:
-          name: 'Cypress v6.0.0'
-          yarn: true
-          executor: cypress/base-12-14-0
-          post-checkout:
-            - run: yarn add -D cypress@6.0.0
-          # we need to start the web application
-          start: npm start
-          command: NODE_ENV=test npm run cypress:run
-          # there are no jobs to follow this one
-          # so no need to save the workspace files (saves time)
-          no-workspace: true
-          # verify the collected code coverage
-          post-steps:
-            # store the created coverage report folder
-            # you can click on it in the CircleCI UI
-            # to see live static HTML site
-            - store_artifacts:
-                path: coverage
-            # show code coverage numbers
-            - run: npm run report:coverage:summary
-            - run: npm run report:coverage:text
-
   # testing the currently installed Cypress version
   test-current-cypress:
     jobs:
@@ -69,7 +42,7 @@ workflows:
           requires:
             - Install
           install-command: echo 'Nothing to install in this job'
-          command: npx cypress run --config-file cypress-unit.json
+          command: npx cypress run --config-file cypress.config.unit.js
           no-workspace: true
 
       - cypress/run:
@@ -84,5 +57,5 @@ workflows:
               only:
                 - master
           start: npm start
-          command: NODE_ENV=test npx cypress run --config-file cypress-smoke.json
+          command: NODE_ENV=test npx cypress run --config-file cypress.config.smoke.js
           no-workspace: true

cypress-unit.json

@@ -0,0 +1,20 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  env: {
+    'cypress-plugin-snapshots': {},
+  },
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      require('@cypress/code-coverage/task')(on, config)
+
+      on('file:preprocessor', require('@cypress/code-coverage/use-babelrc'))
+    
+      return config
+    },
+    baseUrl: 'http://localhost:1234',
+    excludeSpecPattern: ['**/*.snap', '**/__snapshot__/*', '**/smoke.js'],
+  },
+})

cypress.config.js

@@ -1,4 +1,4 @@
-{
+module.exports = {
   "baseUrl": "http://localhost:1234",
   "testFiles": [
     "smoke-spec.js"

cypress-smoke.json renamed to cypress.config.smoke.js

@@ -0,0 +1,10 @@
+module.exports = {
+  pluginsFile: false,
+  fixturesFolder: false,
+  supportFile: "node_modules/cypress-react-unit-test/support",
+  testFiles: "**/*.cy-spec.js",
+  viewportWidth: 300,
+  viewportHeight: 300,
+  experimentalComponentTesting: true,
+  componentFolder: "src/components",
+};