Merge branch 'develop' into feature-multidomain

Author: chrisbreiding

.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,

circle.yml

@@ -1034,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

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.
@@ -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
   }
@@ -5275,7 +5330,7 @@ declare namespace Cypress {
     tag?: string
   }
 
-  interface DevServerOptions {
+  interface DevServerConfig {
     specs: Spec[]
     config: ResolvedConfigOptions & RuntimeConfigOptions
     devServerEvents: NodeJS.EventEmitter
@@ -5294,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
   }
 

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": {
@@ -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
 }

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

@@ -1,8 +1,13 @@
+// @ts-check
+
 const cracoConfig = require('../../craco.config.js')
-const injectDevServer = require('@cypress/react/plugins/craco')
+const devServer = require('@cypress/react/plugins/craco')
 
+/**
+ * @type Cypress.PluginConfig
+ */
 module.exports = (on, config) => {
-  injectDevServer(on, config, cracoConfig)
+  devServer(on, config, cracoConfig)
 
   return config
 }

npm/react/examples/find-webpack/README.md

@@ -38,10 +38,10 @@ Here we are adding some Component Testing specific options, hence the `"componen
 The last thing we need to is tell Cypress to use `@cypress/webpack-dev-server` for component tests. Plugins are explained in detail in the [Cypress documentation](https://docs.cypress.io/guides/tooling/plugins-guide#Installing-plugins). By default plugins are loaded from `cypress/plugins/index.js`. Create that file and add:
 
 ```js
-const injectDevServer = require("@cypress/react/plugins/react-scripts")
+const devServer = require("@cypress/react/plugins/react-scripts")
 
 module.exports = (on, config) => {
-  injectDevServer(on, config)
+  devServer(on, config)
   return config
 }
 ```