Merge pull request #18566 from cypress-io/lmiller1990/merge-in-develop-2020-10-20

chore: backmerge develop into unified-desktop-gui

Author: lmiller1990

.eslintignore

@@ -14,6 +14,21 @@
 **/support/fixtures/projects/**/static/*
 **/support/fixtures/projects/**/*.jsx
 **/support/fixtures/projects/**/fail.js
+
+system-tests/fixtures/*
+!system-tests/projects
+system-tests/projects/**/_fixtures/*
+system-tests/projects/**/static/*
+system-tests/projects/**/*.jsx
+system-tests/projects/**/fail.js
+system-tests/lib/scaffold/plugins/index.js
+system-tests/lib/scaffold/support/index.js
+system-tests/lib/scaffold/support/commands.js
+system-tests/test/support/projects/e2e/cypress/
+system-tests/projects/e2e/cypress/integration/stdout_exit_early_failing_spec.js
+system-tests/projects/e2e/cypress/integration/typescript_syntax_error_spec.ts
+
+
 **/test/fixtures
 **/vendor
 
@@ -23,11 +38,7 @@ cli/types
 packages/example
 
 packages/extension/test/helpers/background.js
-packages/server/lib/scaffold/plugins/index.js
-packages/server/lib/scaffold/support/index.js
-packages/server/lib/scaffold/support/commands.js
-packages/server/test/support/fixtures/projects/e2e/cypress/integration/stdout_exit_early_failing_spec.js
-packages/server/test/support/fixtures/projects/e2e/cypress/integration/typescript_syntax_error_spec.ts
+integration/stdout_exit_early_failing_spec.js
 
 npm/webpack-preprocessor/cypress/tests/e2e/compile-error.js
 npm/webpack-preprocessor/examples/use-babelrc/cypress/integration/spec.js

.gitignore

@@ -63,6 +63,10 @@ packages/server/test/support/fixtures/server/libs
 # from socket, dist built files
 packages/socket/lib/*.js
 
+# from system-tests
+system-tests/.projects
+system-tests/fixtures/large-img
+
 # from npm/react
 /npm/react/bin/*
 /npm/react/cypress/videos
@@ -362,7 +366,6 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-/npm/react/bin/*
 # End of https://www.gitignore.io/api/osx,git,node,windows,intellij,linux
 
 # Circle cache artifacts

.vscode/extensions.json

@@ -0,0 +1,35 @@
+{
+	// To see these extensions in VS Code:
+	// 1. Open the Command Palette (Ctrl+Shift+P)
+	// 2. Select "Extensions: Show Recommended Extensions"
+
+	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+
+	// List of extensions which are recommended for Cypress contributors using VS Code:
+	"recommendations": [
+		// Name: ESLint
+		// Description: Integrates ESLint JavaScript into VS Code.
+		"dbaeumer.vscode-eslint",
+		// Name: GitHub linker
+		// Description: Create links to fragments of code in GitHub
+		"gimenete.github-linker",
+		// Name: GitLens — Git supercharged
+		// Description: Supercharge the Git capabilities built into Visual Studio Code — Visualize code authorship at a glance via Git blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via powerful comparison commands, and so much more
+		"eamodio.gitlens",
+		// Name: Terminals Manager
+		// Description: An extension for setting-up multiple terminals at once, or just running some commands
+		// There are several Terminals defined in `.vscode/terminals.json` that can be used via this plugin.
+		"fabiospampinato.vscode-terminals",
+		// Name: Test Utils
+		// Description: Add, remove, and move .only in tests
+		"chrisbreiding.test-utils",
+		// Name: Toggle Quotes
+		// Description: Toggle cycle " -> ' -> `
+		"britesnow.vscode-toggle-quotes",
+	],
+
+	// List of extensions recommended by VS Code that should not be recommended for Cypress contributors using VS Code:
+	"unwantedRecommendations": [
+
+	]
+}

.vscode/terminals.json

@@ -24,12 +24,20 @@
       "command": "yarn cypress:run --project ../project"
     },
     {
-      "name": "packages/server test-e2e",
+      "name": "cypress open (CT)",
+      "focus": true,
+      "onlySingle": true,
+      "execute": true,
+      "cwd": "[cwd]/packages/server-ct",
+      "command": "yarn cypress:open"
+    },
+    {
+      "name": "system-tests test",
       "focus": true,
       "onlySingle": true,
       "execute": false,
-      "cwd": "[cwd]/packages/server",
-      "command": "yarn test-e2e [fileBasename]"
+      "cwd": "[cwd]/system-tests",
+      "command": "yarn test [fileBasename]"
     },
     {
       "name": "packages/server test-watch",

CONTRIBUTING.md

@@ -396,6 +396,7 @@ By default, top level tasks will execute for all packages. However, most scripts
 | `test-unit`        | Run unit tests                                                   |
 | `test-integration` | Run integration tests                                            |
 | `test-e2e`         | Run end-to-end tests                                             |
+| `test-system`      | Run system tests                                                 |
 | `test-watch`       | Run unit tests and rebuild/rerun on file changes                 |
 
 > Most of the time you will only want to run a task within a specific package; this can be done by providing the package name as a scope to the top level task.
@@ -428,7 +429,6 @@ Each package is responsible for building itself and testing itself and can do so
 | `test`             | Runs all tests once (this usually means running unit tests; via `yarn test-unit`)                                                                        |
 | `test-unit`        | Run all unit tests within the package; `exit 0` if N/A                                                                                                   |
 | `test-integration` | Run all integration tests within the package; `exit 0` if N/A                                                                                            |
-| `test-e2e`         | Run all e2e tests within the package; `exit 0` if N/A                                                                                                    |
 | `test-watch`       | Run all unit tests in the package in watch mode                                                                                                          |
 
 #### Debugging
@@ -486,11 +486,11 @@ This is to ensure that links do not go dead in older versions of Cypress when th
 
 For most packages there are typically unit and integration tests.
 
-Our true e2e tests are in [`packages/server`](packages/server), which test the full stack all together.
+Please refer to each packages' `README.md` which documents how to run tests. It is not feasible to try to run all of the tests together. We run our entire test fleet across over a dozen containers in CI.
 
-Additionally, we test the code by running it against various other example projects in CI. See CI badges and links at the top of this document.
+There are also a set of system tests in [`system-tests`](system-tests) which attempt to test the entire Cypress App as close to real world as possible. See  the [`README`](system-tests/README.md) for more information.
 
-Please refer to each packages' `README.md` which documents how to run tests. It is not feasible to try to run all of the tests together. We run our entire test fleet across over a dozen containers in CI.
+Additionally, we test the code by running it against various other example projects in CI. See CI badges and links at the top of this document.
 
 If you're curious how we manage all of these tests in CI check out our [`circle.yml`](circle.yml) file found in the root `cypress` directory.
 

README.md

@@ -1,79 +1,79 @@
-<p align="center">
-  <img src="https://cloud.githubusercontent.com/assets/1268976/20607953/d7ae489c-b24a-11e6-9cc4-91c6c74c5e88.png"/>
-</p>
-<p align="center">
-  <a href="https://on.cypress.io">Documentation</a> |
-  <a href="https://on.cypress.io/changelog">Changelog</a> |
-  <a href="https://on.cypress.io/roadmap">Roadmap</a>
-</p>
-
-<h3 align="center">
-  The web has evolved. Finally, testing has too.
-</h3>
-
-<p align="center">
-  Fast, easy and reliable testing for anything that runs in a browser.
-</p>
-<p align="center">
-  Join us, we're <a href="https://cypress.io/jobs">hiring</a>.
-</p>
-
-<p align="center">
-  <a href="https://www.npmjs.com/package/cypress">
-    <img src="https://img.shields.io/npm/dm/cypress.svg" alt="npm"/>
-  </a>
-  <a href="https://gitter.im/cypress-io/cypress">
-    <img src="https://img.shields.io/gitter/room/cypress-io/cypress.svg" alt="Gitter chat"/>
-  </a>
-    <a href="https://stackshare.io/cypress">
-    <img src="https://img.stackshare.io/misc/follow-on-stackshare-badge.svg" alt="StackShare"/>
-  </a><br />
-</p>
-
-## What is Cypress?
-
-<p align="center">
-  <a href="https://player.vimeo.com/video/237527670">
-    <img alt="Why Cypress Video" src="https://user-images.githubusercontent.com/1271364/31739717-dbdff0ee-b41c-11e7-9b16-bfa1b6ac1814.png" width="75%" height="75%" />
-  </a>
-</p>
-
-## Installing
-
-[![npm version](https://badge.fury.io/js/cypress.svg)](https://badge.fury.io/js/cypress)
-
-Install Cypress for Mac, Linux, or Windows, then [get started](https://docs.cypress.io/guides/getting-started/installing-cypress.html).
-
-```bash
-npm install cypress --save-dev
-```
-or
-```bash
-yarn add cypress --dev
-```
-
-![installing-cli e1693232](https://user-images.githubusercontent.com/1271364/31740846-7bf607f0-b420-11e7-855f-41c996040d31.gif)
-
-
-## Contributing
-
-- [![CircleCI](https://circleci.com/gh/cypress-io/cypress/tree/develop.svg?style=svg)](https://circleci.com/gh/cypress-io/cypress/tree/develop) - `develop` branch
-- [![CircleCI](https://circleci.com/gh/cypress-io/cypress/tree/master.svg?style=svg)](https://circleci.com/gh/cypress-io/cypress/tree/master) - `master` branch
-
-Please see our [Contributing Guideline](./CONTRIBUTING.md) which explains repo organization, linting, testing, and other steps.
-
-## License
-
-[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/master/LICENSE)
-
-This project is licensed under the terms of the [MIT license](/LICENSE).
-
-## Badges
-
-Let the world know your project is using Cypress.io to test with this cool badge
-
-[![Cypress.io](https://img.shields.io/badge/tested%20with-Cypress-04C38E.svg)](https://www.cypress.io/)
-
-```
-[![Cypress.io](https://img.shields.io/badge/tested%20with-Cypress-04C38E.svg)](https://www.cypress.io/)
-```
+<p align="center">
+  <a href="https://www.cypress.io"><img src="https://cloud.githubusercontent.com/assets/1268976/20607953/d7ae489c-b24a-11e6-9cc4-91c6c74c5e88.png"/></a>
+</p>
+<p align="center">
+  <a href="https://on.cypress.io">Documentation</a> |
+  <a href="https://on.cypress.io/changelog">Changelog</a> |
+  <a href="https://on.cypress.io/roadmap">Roadmap</a>
+</p>
+
+<h3 align="center">
+  The web has evolved. Finally, testing has too.
+</h3>
+
+<p align="center">
+  Fast, easy and reliable testing for anything that runs in a browser.
+</p>
+<p align="center">
+  Join us, we're <a href="https://cypress.io/jobs">hiring</a>.
+</p>
+
+<p align="center">
+  <a href="https://www.npmjs.com/package/cypress">
+    <img src="https://img.shields.io/npm/dm/cypress.svg" alt="npm"/>
+  </a>
+  <a href="https://gitter.im/cypress-io/cypress">
+    <img src="https://img.shields.io/gitter/room/cypress-io/cypress.svg" alt="Gitter chat"/>
+  </a>
+    <a href="https://stackshare.io/cypress">
+    <img src="https://img.stackshare.io/misc/follow-on-stackshare-badge.svg" alt="StackShare"/>
+  </a><br />
+</p>
+
+## What is Cypress?
+
+<p align="center">
+  <a href="https://player.vimeo.com/video/237527670">
+    <img alt="Why Cypress Video" src="https://user-images.githubusercontent.com/1271364/31739717-dbdff0ee-b41c-11e7-9b16-bfa1b6ac1814.png" width="75%" height="75%" />
+  </a>
+</p>
+
+## Installing
+
+[![npm version](https://badge.fury.io/js/cypress.svg)](https://badge.fury.io/js/cypress)
+
+Install Cypress for Mac, Linux, or Windows, then [get started](https://docs.cypress.io/guides/getting-started/installing-cypress.html).
+
+```bash
+npm install cypress --save-dev
+```
+or
+```bash
+yarn add cypress --dev
+```
+
+![installing-cli e1693232](https://user-images.githubusercontent.com/1271364/31740846-7bf607f0-b420-11e7-855f-41c996040d31.gif)
+
+
+## Contributing
+
+- [![CircleCI](https://circleci.com/gh/cypress-io/cypress/tree/develop.svg?style=svg)](https://circleci.com/gh/cypress-io/cypress/tree/develop) - `develop` branch
+- [![CircleCI](https://circleci.com/gh/cypress-io/cypress/tree/master.svg?style=svg)](https://circleci.com/gh/cypress-io/cypress/tree/master) - `master` branch
+
+Please see our [Contributing Guideline](./CONTRIBUTING.md) which explains repo organization, linting, testing, and other steps.
+
+## License
+
+[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/master/LICENSE)
+
+This project is licensed under the terms of the [MIT license](/LICENSE).
+
+## Badges
+
+Let the world know your project is using Cypress.io to test with this cool badge
+
+[![Cypress.io](https://img.shields.io/badge/tested%20with-Cypress-04C38E.svg)](https://www.cypress.io/)
+
+```
+[![Cypress.io](https://img.shields.io/badge/tested%20with-Cypress-04C38E.svg)](https://www.cypress.io/)
+```

browser-versions.json

@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "95.0.4638.40",
+  "chrome:beta": "95.0.4638.54",
   "chrome:stable": "94.0.4606.81"
 }