Merge branch 'develop' into 7.0-release

.github/CODEOWNERS

@@ -0,0 +1,26 @@
+# Each line is a file pattern followed by one or more owners.
+
+# Test Runner team are owners of code within root packages and cli
+/cli/  @cypress-io/test-runner
+/packages/coffee/  @cypress-io/test-runner
+/packages/datetime-utils/  @cypress-io/test-runner
+/packages/desktop-gui/  @cypress-io/test-runner
+/packages/driver/  @cypress-io/test-runner
+/packages/electron/  @cypress-io/test-runner
+/packages/example/  @cypress-io/test-runner
+/packages/extension/  @cypress-io/test-runner
+/packages/https-proxy/  @cypress-io/test-runner
+/packages/launcher/  @cypress-io/test-runner
+/packages/net-stubbing/  @cypress-io/test-runner
+/packages/network/  @cypress-io/test-runner
+/packages/proxy/  @cypress-io/test-runner
+/packages/reporter/  @cypress-io/test-runner
+/packages/rewriter/  @cypress-io/test-runner
+/packages/root/  @cypress-io/test-runner
+/packages/runner/  @cypress-io/test-runner
+/packages/server/  @cypress-io/test-runner
+/packages/socket/  @cypress-io/test-runner
+/packages/static/  @cypress-io/test-runner
+/packages/ts/  @cypress-io/test-runner
+/packages/ui-components/  @cypress-io/test-runner
+/packages/web-config/  @cypress-io/test-runner

circle.yml

@@ -1037,35 +1037,21 @@ jobs:
           path: /tmp/artifacts
       - store-npm-logs
 
+
   desktop-gui-component-tests:
     <<: *defaults
     parallelism: 1
     steps:
       - attach_workspace:
           at: ~/
-      - run:
-          # builds JS and CSS, and we need the app CSS
-          # to correctly apply component styles
-          command: |
-            yarn build-prod
-            ls -la dist
-          working_directory: packages/desktop-gui
-      # for now, because we have baseUrl in cypress.json
-      # we must start it, even if we don't use it for component tests
-      # https://github.com/cypress-io/cypress/issues/7800
-      - run:
-          name: Unnecessary Desktop GUI server
-          command: yarn start
-          working_directory: packages/desktop-gui
-          background: true
       - run:
           # will use PERCY_TOKEN environment variable if available
           command: |
             CYPRESS_KONFIG_ENV=production \
             PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_ID \
             PERCY_PARALLEL_TOTAL=-1 \
             yarn percy exec -- \
-            yarn cypress:run --spec 'src/**/*_spec.jsx'
+            yarn cypress:run:ct
           working_directory: packages/desktop-gui
       - verify-mocha-results
       # we don't really need any artifacts - we are only interested in visual screenshots
@@ -1178,7 +1164,13 @@ jobs:
           at: ~/
       - run:
           name: Run tests
-          command: yarn workspace @cypress/vite-dev-server test
+          command: yarn test --reporter cypress-circleci-reporter --reporter-options resultsDir=./test_results
+          working_directory: npm/vite-dev-server
+      - store_test_results:
+          path: npm/vite-dev-server/test_results
+      - store_artifacts:
+          path: npm/vite-dev-server/cypress/videos
+      - store-npm-logs
 
   npm-rollup-dev-server:
     <<: *defaults

cli/__snapshots__/cli_spec.js

@@ -211,8 +211,10 @@ exports['cli help command shows help 1'] = `
   Commands:
     help               Shows CLI help and exits
     version            prints Cypress version
-    run [options]      Runs Cypress tests from the CLI without the GUI
     open [options]     Opens Cypress in the interactive GUI.
+    run [options]      Runs Cypress tests from the CLI without the GUI
+    open-ct [options]  Opens Cypress component testing interactive mode.
+    run-ct [options]   Runs all Cypress Component Testing suites
     install [options]  Installs the Cypress executable matching this package's
                        version
     verify [options]   Verifies that Cypress is installed correctly and
@@ -247,8 +249,10 @@ exports['cli help command shows help for -h 1'] = `
   Commands:
     help               Shows CLI help and exits
     version            prints Cypress version
-    run [options]      Runs Cypress tests from the CLI without the GUI
     open [options]     Opens Cypress in the interactive GUI.
+    run [options]      Runs Cypress tests from the CLI without the GUI
+    open-ct [options]  Opens Cypress component testing interactive mode.
+    run-ct [options]   Runs all Cypress Component Testing suites
     install [options]  Installs the Cypress executable matching this package's
                        version
     verify [options]   Verifies that Cypress is installed correctly and
@@ -283,8 +287,10 @@ exports['cli help command shows help for --help 1'] = `
   Commands:
     help               Shows CLI help and exits
     version            prints Cypress version
-    run [options]      Runs Cypress tests from the CLI without the GUI
     open [options]     Opens Cypress in the interactive GUI.
+    run [options]      Runs Cypress tests from the CLI without the GUI
+    open-ct [options]  Opens Cypress component testing interactive mode.
+    run-ct [options]   Runs all Cypress Component Testing suites
     install [options]  Installs the Cypress executable matching this package's
                        version
     verify [options]   Verifies that Cypress is installed correctly and
@@ -320,8 +326,10 @@ exports['cli unknown command shows usage and exits 1'] = `
   Commands:
     help               Shows CLI help and exits
     version            prints Cypress version
-    run [options]      Runs Cypress tests from the CLI without the GUI
     open [options]     Opens Cypress in the interactive GUI.
+    run [options]      Runs Cypress tests from the CLI without the GUI
+    open-ct [options]  Opens Cypress component testing interactive mode.
+    run-ct [options]   Runs all Cypress Component Testing suites
     install [options]  Installs the Cypress executable matching this package's
                        version
     verify [options]   Verifies that Cypress is installed correctly and
@@ -443,8 +451,10 @@ exports['cli CYPRESS_INTERNAL_ENV allows and warns when staging environment 1']
   Commands:
     help               Shows CLI help and exits
     version            prints Cypress version
-    run [options]      Runs Cypress tests from the CLI without the GUI
     open [options]     Opens Cypress in the interactive GUI.
+    run [options]      Runs Cypress tests from the CLI without the GUI
+    open-ct [options]  Opens Cypress component testing interactive mode.
+    run-ct [options]   Runs all Cypress Component Testing suites
     install [options]  Installs the Cypress executable matching this package's
                        version
     verify [options]   Verifies that Cypress is installed correctly and

cli/lib/cli.js

@@ -137,8 +137,8 @@ const knownCommands = [
   '--help',
   'install',
   'open',
-  'open-ct',
   'run',
+  'open-ct',
   'run-ct',
   'verify',
   '-v',
@@ -380,6 +380,26 @@ module.exports = {
       showVersions(args)
     })
 
+    program
+    .command('open')
+    .usage('[options]')
+    .description('Opens Cypress in the interactive GUI.')
+    .option('-b, --browser <browser-path>', text('browserOpenMode'))
+    .option('-c, --config <config>', text('config'))
+    .option('-C, --config-file <config-file>', text('configFile'))
+    .option('-d, --detached [bool]', text('detached'), coerceFalse)
+    .option('-e, --env <env>', text('env'))
+    .option('--global', text('global'))
+    .option('-p, --port <port>', text('port'))
+    .option('-P, --project <project-path>', text('project'))
+    .option('--dev', text('dev'), coerceFalse)
+    .action((opts) => {
+      debug('opening Cypress')
+      require('./exec/open')
+      .start(util.parseOpts(opts))
+      .catch(util.logErrorExit1)
+    })
+
     addCypressRunCommand(program)
     .action((...fnArgs) => {
       debug('running Cypress with args %o', fnArgs)
@@ -390,8 +410,7 @@ module.exports = {
     })
 
     program
-    // TODO make this command public once CT will be merged completely
-    .command('open-ct', { hidden: true })
+    .command('open-ct')
     .usage('[options]')
     .description('Opens Cypress component testing interactive mode.')
     .option('-b, --browser <browser-path>', text('browserOpenMode'))
@@ -411,8 +430,7 @@ module.exports = {
     })
 
     program
-    // TODO make this command public once CT will be merged completely
-    .command('run-ct', { hidden: true })
+    .command('run-ct')
     .usage('[options]')
     .description('Runs all Cypress Component Testing suites')
     .option('-b, --browser <browser-name-or-path>', text('browserRunMode'))
@@ -443,26 +461,6 @@ module.exports = {
       .catch(util.logErrorExit1)
     })
 
-    program
-    .command('open')
-    .usage('[options]')
-    .description('Opens Cypress in the interactive GUI.')
-    .option('-b, --browser <browser-path>', text('browserOpenMode'))
-    .option('-c, --config <config>', text('config'))
-    .option('-C, --config-file <config-file>', text('configFile'))
-    .option('-d, --detached [bool]', text('detached'), coerceFalse)
-    .option('-e, --env <env>', text('env'))
-    .option('--global', text('global'))
-    .option('-p, --port <port>', text('port'))
-    .option('-P, --project <project-path>', text('project'))
-    .option('--dev', text('dev'), coerceFalse)
-    .action((opts) => {
-      debug('opening Cypress')
-      require('./exec/open')
-      .start(util.parseOpts(opts))
-      .catch(util.logErrorExit1)
-    })
-
     program
     .command('install')
     .usage('[options]')

cli/lib/util.js

@@ -197,7 +197,6 @@ const parseOpts = (opts) => {
     'cacheClear',
     'cachePrune',
     'ciBuildId',
-    'componentTesting',
     'config',
     'configFile',
     'cypressVersion',