.vscode/terminals.json

@@ -23,14 +23,6 @@
       "execute": false,
       "command": "yarn cypress:run --project ../project"
     },
-    {
-      "name": "cypress open (CT)",
-      "focus": true,
-      "onlySingle": true,
-      "execute": true,
-      "cwd": "[cwd]/packages/server-ct",
-      "command": "yarn cypress:open"
-    },
     {
       "name": "packages/server test-e2e",
       "focus": true,

CONTRIBUTING.md

@@ -290,7 +290,6 @@ Here is a list of the core packages in this repository with a short description,
  | [server](./packages/server)           | `@packages/server`      | The <3 of Cypress. This orchestrates everything. The backend node process.   |
  | [server-ct](./packages/server-ct)     | `@packages/server-ct`   | Some Component Testing specific overrides. Mostly extends functionality from `@packages/server` |
  | [socket](./packages/socket)           | `@packages/socket`      | A wrapper around socket.io to provide common libraries.                      |
- | [static](./packages/static)           | `@packages/static`      | Serves static assets used in the Cypress GUI.                                |
  | [ts](./packages/ts)                   | `@packages/ts`          | A centralized version of typescript.                                         |
 
 Public packages live within the [`npm`](./npm) folder and are standalone modules that get independently published to npm under the `@cypress/` namespace. These packages generally contain extensions, plugins, or other packages that are complementary to, yet independent of, the main Cypress app.

appveyor.yml

@@ -2,7 +2,7 @@ branches:
   only:
     - master
     - develop
-    - windows-code-signing
+    - fix-test-other-projects
     - /win*/
 
 # https://www.appveyor.com/docs/lang/nodejs-iojs/

browser-versions.json

@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "93.0.4577.58",
-  "chrome:stable": "92.0.4515.159"
+  "chrome:beta": "94.0.4606.31",
+  "chrome:stable": "93.0.4577.63"
 }

circle.yml

@@ -8,7 +8,7 @@ macBuildFilters: &macBuildFilters
     branches:
       only:
         - develop
-        - issue-17773-slow-browser-detection
+        - fix-test-other-projects
 
 defaults: &defaults
   parallelism: 1
@@ -42,6 +42,7 @@ onlyMainBranches: &onlyMainBranches
     branches:
       only:
         - develop
+        - fix-test-other-projects
   requires:
     - create-build-artifacts
 
@@ -303,6 +304,7 @@ commands:
             dpkg -i /usr/src/google-chrome-<<parameters.channel>>_<<parameters.version>>_amd64.deb ; \
             apt-get install -f -y && \
             rm -f /usr/src/google-chrome-<<parameters.channel>>_<<parameters.version>>_amd64.deb
+            which google-chrome-<<parameters.channel>> || (printf "\n\033[0;31mChrome was not successfully downloaded - bailing\033[0m\n\n" && exit 1)
             echo "Location of Google Chrome Installation: `which google-chrome-<<parameters.channel>>`"
             echo "Google Chrome Version: `google-chrome-<<parameters.channel>> --version`"
 
@@ -1032,18 +1034,6 @@ jobs:
           path: /tmp/cypress
       - store-npm-logs
 
-  server-ct-unit-tests:
-    <<: *defaults
-    parallelism: 1
-    steps:
-      - restore_cached_workspace
-      - run: yarn test-unit --scope @packages/server-ct
-      - verify-mocha-results:
-          expectedResultCount: 1
-      - store_test_results:
-          path: /tmp/cypress
-      - store-npm-logs
-
   server-integration-tests:
     <<: *defaults
     resource_class: medium
@@ -1491,7 +1481,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "issue-17773-slow-browser-detection" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-test-other-projects" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -2126,6 +2116,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
+              - fix-test-other-projects
         requires:
           - build
     - test-kitchensink:
@@ -2137,6 +2128,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
+              - fix-test-other-projects
         requires:
           - build
     - create-build-artifacts:
@@ -2186,13 +2178,15 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
+              - fix-test-other-projects
         requires:
           - create-build-artifacts
     - test-npm-module-and-verify-binary:
         filters:
           branches:
             only:
               - develop
+              - fix-test-other-projects
         requires:
           - create-build-artifacts
     - test-binary-against-staging:
@@ -2201,6 +2195,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
+              - fix-test-other-projects
         requires:
           - create-build-artifacts
 
@@ -2225,6 +2220,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
+              - fix-test-other-projects
         requires:
           - create-build-artifacts
 
@@ -2296,6 +2292,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
+              - fix-test-other-projects
         requires:
           - darwin-create-build-artifacts
 
@@ -2307,6 +2304,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
+              - fix-test-other-projects
         requires:
           - darwin-create-build-artifacts
 

cli/types/cypress.d.ts

@@ -22,6 +22,19 @@ declare namespace Cypress {
     password: string
   }
 
+  interface RemoteState {
+    auth?: {
+      username: string
+      password: string
+    }
+    domainName: string
+    strategy: 'file' | 'http'
+    origin: string
+    fileServer: string
+    props: Record<string, any>
+    visiting: string
+  }
+
   interface Backend {
     /**
      * Firefox only: Force Cypress to run garbage collection routines.
@@ -2060,7 +2073,7 @@ declare namespace Cypress {
      * @alias cy.location('href')
      * @see https://on.cypress.io/url
      */
-    url(options?: Partial<Loggable & Timeoutable>): Chainable<string>
+    url(options?: Partial<UrlOptions>): Chainable<string>
 
     /**
      * Control the size and orientation of the screen for your application.
@@ -2488,6 +2501,47 @@ declare namespace Cypress {
     cmdKey: boolean
   }
 
+  interface PEMCert {
+    /**
+     * Path to the certificate file, relative to project root.
+     */
+    cert: string
+    /**
+     * Path to the private key file, relative to project root.
+     */
+    key: string
+    /**
+     * Path to a text file containing the passphrase, relative to project root.
+     */
+    passphrase?: string
+  }
+
+  interface PFXCert {
+    /**
+     * Path to the certificate container, relative to project root.
+     */
+    pfx: string
+    /**
+     * Path to a text file containing the passphrase, relative to project root.
+     */
+    passphrase?: string
+  }
+
+  interface ClientCertificate {
+    /**
+     * URL to match requests against. Wildcards following [minimatch](https://github.com/isaacs/minimatch) rules are supported.
+     */
+    url: string
+    /**
+     * Paths to one or more CA files to validate certs against, relative to project root.
+     */
+    ca?: string[]
+    /**
+     * A PEM format certificate/private key pair or PFX certificate container
+     */
+    certs: PEMCert[] | PFXCert[]
+  }
+
   interface ResolvedConfigOptions {
     /**
      * Url used as prefix for [cy.visit()](https://on.cypress.io/visit) or [cy.request()](https://on.cypress.io/request) command’s url
@@ -2750,6 +2804,11 @@ declare namespace Cypress {
      * @default {}
      */
     e2e: Omit<ResolvedConfigOptions, TestingType>
+
+    /**
+     * An array of objects defining the certificates
+     */
+    clientCertificates: ClientCertificate[]
   }
 
   /**
@@ -2810,19 +2869,15 @@ declare namespace Cypress {
     projectName: string
     projectRoot: string
     proxyUrl: string
+    remote: RemoteState
     report: boolean
     reporterRoute: string
     reporterUrl: string
     socketId: null | string
     socketIoCookie: string
     socketIoRoute: string
-    spec: {
-      absolute: string
-      name: string
-      relative: string
-      specFilter: null | string
-      specType: 'integration' | 'component'
-    }
+    spec: Cypress['spec']
+    specs: Array<Cypress['spec']>
     xhrRoute: string
     xhrUrl: string
   }
@@ -3173,6 +3228,18 @@ declare namespace Cypress {
     eventConstructor: string
   }
 
+  /**
+   * Options to change the default behavior of .url()
+   */
+  interface UrlOptions extends Loggable, Timeoutable {
+    /**
+     * Whether the url is decoded
+     *
+     * @default false
+     */
+    decode: boolean
+  }
+
   /** Options to change the default behavior of .writeFile */
   interface WriteFileOptions extends Loggable {
     flag: string
@@ -5263,7 +5330,7 @@ declare namespace Cypress {
     tag?: string
   }
 
-  interface DevServerOptions {
+  interface DevServerConfig {
     specs: Spec[]
     config: ResolvedConfigOptions & RuntimeConfigOptions
     devServerEvents: NodeJS.EventEmitter
@@ -5282,7 +5349,7 @@ declare namespace Cypress {
     (action: 'before:spec', fn: (spec: Spec) => void | Promise<void>): void
     (action: 'before:browser:launch', fn: (browser: Browser, browserLaunchOptions: BrowserLaunchOptions) => void | BrowserLaunchOptions | Promise<BrowserLaunchOptions>): void
     (action: 'file:preprocessor', fn: (file: FileObject) => string | Promise<string>): void
-    (action: 'dev-server:start', fn: (file: DevServerOptions) => Promise<ResolvedDevServerConfig>): void
+    (action: 'dev-server:start', fn: (file: DevServerConfig) => Promise<ResolvedDevServerConfig>): void
     (action: 'task', tasks: Tasks): void
   }
 

cli/types/tests/cypress-tests.ts

@@ -483,6 +483,11 @@ namespace CypressLocationTests {
   cy.location('pathname') // $ExpectType Chainable<string>
 }
 
+// https://github.com/cypress-io/cypress/issues/17399
+namespace CypressUrlTests {
+  cy.url({decode: true}).should('contain', '사랑')
+}
+
 namespace CypressBrowserTests {
   Cypress.isBrowser('chrome')// $ExpectType boolean
   Cypress.isBrowser('firefox')// $ExpectType boolean

npm/angular/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@cypress/angular",
   "version": "0.0.0-development",
+  "description": "Test Angular components using Cypress",
   "private": true,
   "main": "dist/index.js",
   "scripts": {
@@ -62,7 +63,7 @@
     "tslib": "^2.2.0",
     "tslint": "5.20.1",
     "typescript": "4.2.4",
-    "webpack-dev-server": "3.11.2",
+    "webpack-dev-server": "4.0.0",
     "zone.js": "0.11.4"
   },
   "peerDependencies": {
@@ -84,5 +85,12 @@
     "type": "git",
     "url": "https://github.com/cypress-io/cypress.git"
   },
-  "homepage": "https://on.cypress.io/component-testing"
-}
+  "homepage": "https://on.cypress.io/component-testing",
+  "author": "Gleb Bahmutov <gleb.bahmutov@gmail.com>",
+  "contributors": [
+    {
+      "name": "Jean-Michel Leclercq",
+      "social": "@LeJeanbono"
+    }
+  ]
+}

npm/cypress-schematic/src/builders/cypress/cypressBuilderOptions.ts

@@ -3,7 +3,7 @@ import { JsonObject } from '@angular-devkit/core'
 export interface CypressBuilderOptions extends JsonObject {
   baseUrl: string
   configFile: string | false
-  browser: 'electron' | 'chrome' | 'chromium' | 'canary' | 'firefox' | string
+  browser: 'electron' | 'chrome' | 'chromium' | 'canary' | 'firefox' | 'edge' | string
   devServerTarget: string
   env: Record<string, string>
   quiet: boolean

npm/cypress-schematic/src/builders/cypress/schema.json

@@ -27,7 +27,8 @@
         "chrome",
         "chromium",
         "canary",
-        "firefox"
+        "firefox",
+        "edge"
       ]
     },
     "devServerTarget": {

npm/react/examples/a11y/cypress/plugins/index.js

@@ -1,9 +1,14 @@
-// load file preprocessor that comes with this plugin
+// @ts-check
+
+// load file devServer that comes with this plugin
 // https://github.com/bahmutov/cypress-react-unit-test#install
-const preprocessor = require('@cypress/react/plugins/react-scripts')
+const devServer = require('@cypress/react/plugins/react-scripts')
 
+/**
+ * @type Cypress.PluginConfig
+ */
 module.exports = (on, config) => {
-  preprocessor(on, config)
+  devServer(on, config)
 
   // IMPORTANT to return the config object
   // with the any changed environment variables

npm/react/examples/craco/README.md

@@ -7,10 +7,10 @@ Use the plugin:
 
 // import your craco.config.js
 const cracoConfig = require('../../craco.config.js')
-const injectDevServer = require('@cypress/react/plugins/craco')
+const devServer = require('@cypress/react/plugins/craco')
 
 module.exports = (on, config) => {
-  injectDevServer(on, config, cracoConfig)
+  devServer(on, config, cracoConfig)
 
   return config
 }