-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #18566 from cypress-io/lmiller1990/merge-in-develo…
…p-2020-10-20 chore: backmerge develop into unified-desktop-gui
- Loading branch information
Showing
850 changed files
with
47,805 additions
and
1,085 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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": [ | ||
|
|
||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
|
|
||
| [](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 | ||
| ``` | ||
|
|
||
|  | ||
|
|
||
|
|
||
| ## Contributing | ||
|
|
||
| - [](https://circleci.com/gh/cypress-io/cypress/tree/develop) - `develop` branch | ||
| - [](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 | ||
|
|
||
| [](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 | ||
|
|
||
| [](https://www.cypress.io/) | ||
|
|
||
| ``` | ||
| [](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 | ||
|
|
||
| [](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 | ||
| ``` | ||
|
|
||
|  | ||
|
|
||
|
|
||
| ## Contributing | ||
|
|
||
| - [](https://circleci.com/gh/cypress-io/cypress/tree/develop) - `develop` branch | ||
| - [](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 | ||
|
|
||
| [](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 | ||
|
|
||
| [](https://www.cypress.io/) | ||
|
|
||
| ``` | ||
| [](https://www.cypress.io/) | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| { | ||
| "chrome:beta": "95.0.4638.40", | ||
| "chrome:beta": "95.0.4638.54", | ||
| "chrome:stable": "94.0.4606.81" | ||
| } |
Oops, something went wrong.