feat: support specPattern, deprecate integrationFolder and componentFolder

appveyor.yml

@@ -1,105 +0,0 @@
-branches:
-  only:
-    - master
-    - develop
-    - windows-code-signing
-    - 10.0-release
-    - /win*/
-
-# https://www.appveyor.com/docs/lang/nodejs-iojs/
-environment:
-  # use matching version of Node.js
-  nodejs_version: "16.5.0"
-  # encode secure variables which will NOT be used
-  # in pull requests
-  # https://www.appveyor.com/docs/build-configuration/#secure-variables
-  # the variables can be encrypted at
-  # https://ci.appveyor.com/tools/encrypt
-  ci_json:
-    secure: uOM7Bj+6MfQA/wiUzA4MolZDlcdhIqrOWLN0LdR+Lg4olc1onF3IpWfRf+3B6Q5uT98OTnIU71OOqSRY7inGQg==
-  # for uploading built binary to S3 bucket
-  aws_credentials_json:
-    secure: ttGzd2/rW+i8H+pozcFxzZKU07B5INL8+LjD4vCOKes+tI6EaKhrLvAQ9xT7r+e1p8My8f4LrqvT+i37kbRCUPY4DHmUgagj3aj0OghsT0eX/Vr/6T4v1yndB7SX7FnG07eVcGb63r9f5kT7xu7ElJ9WXh1Ok5K69W0zDPsa1RGCCYqsTi4tH2h5EAZwjY1b
-  # CDN control
-  CF_TOKEN:
-    secure: nVGxcWxXGvrT621HmgMf9Mwm84dqo+cKHZj94OvyyWEGIZOJJkbWHsD/l2/r4a6Y
-  CF_ZONEID:
-    secure: SrZnd4BYW9PILEEi7y9VyXuC16C+qMEDT3QuV1PZZJa47TRkjcaYpAXhAHz0j0jT
-  # authenticate as Cypress bot when posting commit status checks
-  GH_APP_ID:
-    secure: oR0RVDbv6GKej4wwjkz7Zw==
-  GH_INSTALLATION_ID:
-    secure: tAoqu4zIgZUxOfW0u9YQgw==
-  GH_PRIVATE_KEY:
-    secure: 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
-  CSC_KEY_PASSWORD:
-    secure: GiXelhGGKXKUNW6T7ptKUw==
-  CSC_LINK:
-    secure: 9uSZwUYwcdZejLTpGpySd6t9JSL1Hw3iTvb4T2HZrx6iKd5DSR7AN6A7lS5ThTZ6g1JNSypSHRwDeC1Z5xkP8QEIjDqKjyNrqC19gCiSMrpdjjIR8Y8upIISrDBWjOiI
-
-platform:
-  - x64
-
-# https://www.appveyor.com/docs/build-cache/
-# hmm, seems there is NPM on windows problem
-# with installing over cached folder
-# https://github.com/npm/npm/issues/17747
-# cache:
-#   - node_modules -> yarn.lock
-#   - '%LOCALAPPDATA%/Yarn -> yarn.lock'
-#   # todo: cache node_modules in each package
-
-# Install scripts. (runs after repo cloning)
-install:
-  # it is not a given that AppVeyor has the exact version of Node we need predownloaded
-  # see https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs
-  - ps: Update-NodeJsInstallation $env:nodejs_version $env:platform
-  # - ps: Install-Product node $env:nodejs_version $env:platform
-  # upgrade npm
-  - yarn global add @bahmutov/print-env@1
-  # Output useful info for debugging.
-  - node --version
-  - node --print process.arch
-  - yarn --version
-  # prints all public variables relevant to the build
-  - print-env Platform
-  - yarn check-node-version
-  - print-env APPVEYOR
-  # prints if we have sensitive variables that start with a prefix GH
-  # which are used to trigger other projects
-  # ignore errors - forked pull requests will NOT have these variables set
-  - has-env GH || true
-  # clean cache to prevent install permission issues
-  - yarn cache clean
-  - yarn --frozen-lockfile || yarn --frozen-lockfile || yarn --frozen-lockfile
-  - yarn build-prod
-  - .\node_modules\.bin\print-arch
-
-# Post-install test scripts.
-test_script:
-  # Output useful info for debugging.
-  # beware of echo-ing environment variables that may have batch syntax (e.g. commit messages)
-  - node --version
-  - yarn --version
-  - 7z
-  - echo *** System info ***
-  - node cli/bin/cypress info --dev
-
-  # make sure mocha runs
-  - yarn test-mocha
-  # make sure our snapshots are compared correctly
-  # - npm run test-mocha-snapshot
-  # the other larger tests
-  - echo *** Building Windows NPM package ***
-  - yarn get-next-version --npm
-  - cd cli
-  - yarn
-  - yarn build
-  - cd build
-  - yarn pack
-  - cd ../..
-
-  - node ./scripts/win-appveyor-build.js
-
-# Don't actually build.
-build: off

circle.yml

@@ -500,7 +500,7 @@ commands:
               PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_ID \
               PERCY_ENABLE=${PERCY_TOKEN:-0} \
               PERCY_PARALLEL_TOTAL=-1 \
-              yarn percy upload packages/runner-ct/cypress/screenshots/screenshot.spec.tsx/percy
+              yarn percy upload packages/runner-ct/cypress/screenshots/cypress/component/screenshot.spec.tsx/percy
             else
               echo "skipping percy screenshots uploading"
             fi
@@ -1860,46 +1860,6 @@ jobs:
             echo "console.log('hello world')" > hello.ts
             npx tsc hello.ts --noEmit
 
-  # testing scaffolding examples and running them
-  # against example.cypress.io
-  test-cypress-scaffold:
-    resource_class: medium
-    parameters:
-      executor:
-        description: Executor name to use
-        type: executor
-        default: cy-doc
-      wd:
-        description: Working directory, should be OUTSIDE cypress monorepo folder
-        type: string
-        default: /root/test-scaffold
-    <<: *defaults
-    steps:
-      - restore_workspace_binaries
-      - run: mkdir <<parameters.wd>>
-      - run:
-          name: Create new NPM package ⚗️
-          working_directory: <<parameters.wd>>
-          command: npm init -y
-      - run:
-          name: Install dependencies 📦
-          working_directory: <<parameters.wd>>
-          environment:
-            CYPRESS_INSTALL_BINARY: /root/cypress/cypress.zip
-          # let's install Cypress, Jest and any other package that might conflict
-          # https://github.com/cypress-io/cypress/issues/6690
-          command: |
-            npm install /root/cypress/cypress.tgz \
-              typescript jest @types/jest enzyme @types/enzyme
-      - run:
-          name: Scaffold and test examples 🏗
-          working_directory: <<parameters.wd>>
-          environment:
-            CYPRESS_INTERNAL_FORCE_SCAFFOLD: "1"
-          command: |
-            echo 'module.exports = {}' > cypress.config.js
-            npx cypress run
-
   test-full-typescript-project:
     parameters:
       executor:
@@ -2359,9 +2319,6 @@ linux-workflow: &linux-workflow
     - test-types-cypress-and-jest:
         requires:
           - create-build-artifacts
-    - test-cypress-scaffold:
-        requires:
-          - create-build-artifacts
     - test-full-typescript-project:
         requires:
           - create-build-artifacts

cli/types/cypress.d.ts

@@ -2630,6 +2630,7 @@ declare namespace Cypress {
     /**
      * Path to folder containing integration test files
      * @default "cypress/integration"
+     * @deprecated
      */
     integrationFolder: string
     /**
@@ -2774,6 +2775,7 @@ declare namespace Cypress {
     blockHosts: null | string | string[]
     /**
      * Path to folder containing component test files.
+     * @deprecated
      */
     componentFolder: false | string
     /**
@@ -2787,6 +2789,12 @@ declare namespace Cypress {
     /**
      * Glob pattern to determine what test files to load.
      */
+    specPattern: string | string[]
+    /**
+     * Glob pattern to determine what test files to load.
+     *
+     * @deprecated Use `specPattern` under `component` or `e2e`
+     */
     testFiles: string | string[]
     /**
      * The user agent the browser sends in all request headers.

npm/angular/cypress.config.ts

@@ -7,8 +7,7 @@ export default defineConfig({
   'fileServerFolder': 'src',
   'projectId': 'nf7zag',
   'component': {
-    'componentFolder': 'src/app',
-    'testFiles': '**/*cy-spec.ts',
+    'specPattern': 'src/app/**/*cy-spec.ts',
     'setupNodeEvents': require('./cypress/plugins'),
     devServer (cypressConfig) {
       const { startDevServer } = require('@cypress/webpack-dev-server')

npm/angular/package.json

@@ -13,7 +13,8 @@
     "app-start": "ng serve",
     "app-build": "ng build",
     "test": "yarn cy:run",
-    "test-ci": "yarn cy:run"
+    "test-ci": "yarn cy:run",
+    "postinstall": "patch-package"
   },
   "dependencies": {
     "@cypress/mount-utils": "0.0.0-development",

npm/angular/patches/@cypress+code-coverage+3.9.5.patch

@@ -0,0 +1,45 @@
+diff --git a/node_modules/@cypress/code-coverage/support-utils.js b/node_modules/@cypress/code-coverage/support-utils.js
+index 31e00ee..0c56908 100644
+--- a/node_modules/@cypress/code-coverage/support-utils.js
++++ b/node_modules/@cypress/code-coverage/support-utils.js
+@@ -10,7 +10,7 @@ const filterSpecsFromCoverage = (totalCoverage, config = Cypress.config) => {
+   const integrationFolder = config('integrationFolder')
+   /** @type {string} Cypress run-time config has test files string pattern */
+   // @ts-ignore
+-  const testFilePattern = config('testFiles')
++  const testFilePattern = config('specPattern')
+
+   // test files chould be:
+   //  wild card string "**/*.*" (default)
+diff --git a/node_modules/@cypress/code-coverage/support.js b/node_modules/@cypress/code-coverage/support.js
+index c99ceb2..f51ce4e 100644
+--- a/node_modules/@cypress/code-coverage/support.js
++++ b/node_modules/@cypress/code-coverage/support.js
+@@ -37,7 +37,6 @@ const logMessage = (s) => {
+  * If there are more files loaded from support folder, also removes them
+  */
+ const filterSupportFilesFromCoverage = (totalCoverage) => {
+-  const integrationFolder = Cypress.config('integrationFolder')
+   const supportFile = Cypress.config('supportFile')
+
+   /** @type {string} Cypress run-time config has the support folder string */
+@@ -50,16 +49,9 @@ const filterSupportFilesFromCoverage = (totalCoverage) => {
+     isSupportFile(filename)
+   )
+
+-  // check the edge case
+-  //   if we have files from support folder AND the support folder is not same
+-  //   as the integration, or its prefix (this might remove all app source files)
+-  //   then remove all files from the support folder
+-  if (!integrationFolder.startsWith(supportFolder)) {
+-    // remove all covered files from support folder
+-    coverage = Cypress._.omitBy(totalCoverage, (fileCoverage, filename) =>
+-      filename.startsWith(supportFolder)
+-    )
+-  }
++  coverage = Cypress._.omitBy(totalCoverage, (fileCoverage, filename) =>
++    filename.startsWith(supportFolder)
++  )
+   return coverage
+ }
+

npm/design-system/cypress.config.js

@@ -3,17 +3,16 @@ module.exports = {
   viewportHeight: 800,
   video: false,
   projectId: 'z9dxah',
-  testFiles: '**/*spec.{js,jsx,ts,tsx}',
   env: {
     reactDevtools: true,
   },
   ignoreTestFiles: [
     '**/__snapshots__/*',
     '**/__image_snapshots__/*',
   ],
-  componentFolder: 'src',
   fixturesFolder: false,
   component: {
+    specPattern: 'src/**/*spec.{js,jsx,ts,tsx}',
     devServer (cypressConfig) {
       const { startDevServer } = require('@cypress/vite-dev-server')
 

npm/react/cypress.config.js

@@ -5,7 +5,6 @@ module.exports = {
   'viewportHeight': 400,
   'video': false,
   'projectId': 'z9dxah',
-  'testFiles': '**/*spec.{js,jsx,ts,tsx}',
   'env': {
     'reactDevtools': true,
   },
@@ -15,6 +14,7 @@ module.exports = {
   ],
   'experimentalFetchPolyfill': true,
   'component': {
+    'specPattern': 'cypress/component/**/*spec.{js,jsx,ts,tsx}',
     devServer (cypressConfig, devServerConfig) {
       const { startDevServer } = require('@cypress/webpack-dev-server')
       const path = require('path')

npm/react/examples.env

@@ -5,7 +5,7 @@
 /examples/react-scripts-typescript
 /examples/find-webpack
 /examples/webpack-file
-/examples/react-scripts-folder
+# /examples/react-scripts-folder
 /examples/using-babel-typescript
 /examples/webpack-options
 /examples/sass-and-ts

npm/react/examples/a11y/cypress.config.js

@@ -1,10 +1,10 @@
 module.exports = {
   'video': false,
   'fixturesFolder': false,
-  'testFiles': '**/*spec.js',
   'viewportWidth': 500,
   'viewportHeight': 500,
   'component': {
+    'specPattern': 'cypress/component/**/*spec.js',
     setupNodeEvents (on, config) {
       // load file devServer that comes with this plugin
       // https://github.com/bahmutov/cypress-react-unit-test#install

npm/react/examples/craco/cypress.config.js

@@ -1,7 +1,6 @@
 module.exports = {
   'component': {
-    'testFiles': '**/*.test.{js,ts,jsx,tsx}',
-    'componentFolder': 'src',
+    'specPattern': 'cypress/component/**/*.test.{js,ts,jsx,tsx}',
     setupNodeEvents (on, config) {
       const cracoConfig = require('./craco.config.js')
       const devServer = require('@cypress/react/plugins/craco')

npm/react/examples/find-webpack/cypress.config.ts

@@ -4,8 +4,7 @@ export default defineConfig({
   'video': true,
   'projectId': 'jq5xpp',
   'component': {
-    'testFiles': '**/*.spec.{js,ts,jsx,tsx}',
-    'componentFolder': 'src',
+    'specPattern': 'src/**/*.spec.{js,ts,jsx,tsx}',
     devServer (cypressConfig) {
       const findReactScriptsWebpackConfig = require('@cypress/react/plugins/react-scripts/findReactScriptsWebpackConfig')
       const { startDevServer } = require('@cypress/webpack-dev-server')

npm/react/examples/nextjs-webpack-5/cypress.config.js

@@ -1,11 +1,10 @@
 module.exports = {
   'video': false,
-  'testFiles': '**/*.spec.{js,jsx}',
   'viewportWidth': 500,
   'viewportHeight': 800,
-  'componentFolder': 'cypress/components',
   'pluginsFile': 'cypress/plugins.js',
   'component': {
+    'specPattern': 'cypress/component/**/*.spec.{js,jsx}',
     setupNodeEvents (on, config) {
       const devServer = require('@cypress/react/plugins/next')
 

npm/react/examples/nextjs/cypress.config.js

@@ -1,14 +1,13 @@
 module.exports = {
   'video': false,
-  'testFiles': '**/*.spec.{js,jsx}',
   'viewportWidth': 500,
   'viewportHeight': 800,
   'experimentalFetchPolyfill': true,
-  'componentFolder': 'cypress/components',
   'env': {
     'coverage': true,
   },
   'component': {
+    'specPattern': 'cypress/components/**/*.spec.{js,jsx}',
     setupNodeEvents (on, config) {
       const devServer = require('@cypress/react/plugins/next')
 

npm/react/examples/react-scripts-folder/cypress.config.js

@@ -1,11 +1,10 @@
 module.exports = {
   'video': false,
   'fixturesFolder': false,
-  'testFiles': '**/*cy-spec.js',
   'viewportWidth': 500,
   'viewportHeight': 800,
-  'componentFolder': 'cypress/component',
   'component': {
+    'specPattern': 'cypress/component/**/*cy-spec.js',
     setupNodeEvents (on, config) {
       // load file devServer that comes with this plugin
       // https://github.com/bahmutov/cypress-react-unit-test#install

npm/react/examples/react-scripts-typescript/cypress.config.js

@@ -1,10 +1,9 @@
 module.exports = {
   'video': false,
-  'testFiles': '**/*cy-spec.tsx',
   'viewportWidth': 500,
   'viewportHeight': 800,
-  'componentFolder': 'src',
   'component': {
+    'specPattern': 'src/**/*cy-spec.tsx',
     setupNodeEvents (on, config) {
       const devServer = require('@cypress/react/plugins/react-scripts')