Skip to content

Commit

Permalink
Merge branch 'develop' into 10.0-release
Browse files Browse the repository at this point in the history
* develop: (35 commits)
  fix(deps): update dependency url-parse to v1.5.6 [security] (#20270)
  chore: fix cache keys to include PLATFORM (#20279)
  chore: fix server performance flake (#20271)
  test(system-tests): support docker-based tests against built binary (#20250)
  chore: fix system-test-firefox screenshots_spec flake (#20268)
  chore(deps): update dependency fs-extra to v9 🌟 (#19939)
  fix: Wait for child process to be ready (#19792)
  fix: treat form-data bodies as binary (#20144)
  test: replace cypress-test-example-repos coverage + remove bump (#20186)
  fix(driver): update wrapErr to ignore number and boolean values (#20172)
  release 9.5.0 [skip ci]
  chore: Update Chrome (stable) to 98.0.4758.102 (#20192)
  chore: enable volar.takeOverMode
  Add span names, merge develop
  fix: Update `.type(' ')` to not emit clicks when the keyup event has been prevented (#20156)
  test: remove redundant "other projects" CI jobs (#20133)
  chore(driver): move cy.focused and cy.root into their own files (#20054)
  Move sending root event to own script
  chore: release @cypress/vue-v3.1.1
  chore: release @cypress/react-v5.12.3
  ...
  • Loading branch information
tgriesser committed Feb 22, 2022
2 parents 91b3686 + 0143e13 commit 47b1f38
Show file tree
Hide file tree
Showing 56 changed files with 1,318 additions and 769 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Expand Up @@ -38,5 +38,5 @@
// Volar is the main extension that powers Vue's language features.
// These are commented out because they slow down node development
// "volar.autoCompleteRefs": false,
// "volar.takeOverMode.enabled": true
"volar.takeOverMode.enabled": true,
}
15 changes: 0 additions & 15 deletions CONTRIBUTING.md
Expand Up @@ -18,7 +18,6 @@ Thanks for taking the time to contribute! :smile:

## Table of Contents

- [CI Status](#ci-status)
- [Code of Conduct](#code-of-conduct)
- [Opening Issues](#opening-issues)
- [Triaging Issues](#triaging-issues)
Expand All @@ -42,20 +41,6 @@ Thanks for taking the time to contribute! :smile:
- [Code Review of Dependency Updates](#Code-Review-of-Dependency-Updates)
- [Deployment](#deployment)

## CI status

| Build status | Description |
| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | :----------------------------------------------------------------------------------------- |
| [![CircleCI](https://circleci.com/gh/cypress-io/cypress-test-node-versions.svg?style=svg&circle-token=6a7c4e7e7ab427e11bea6c2af3df29c4491d2376)](https://circleci.com/gh/cypress-io/cypress-test-node-versions) | [cypress-test-node-versions](https://github.com/cypress-io/cypress-test-node-versions) |
| [![CircleCI](https://circleci.com/gh/cypress-io/cypress-test-ci-environments.svg?style=svg&circle-token=66a4d36c3966cbe476f13e7dfbe3af0693db3fb9)](https://circleci.com/gh/cypress-io/cypress-test-ci-environments) | [cypress-test-ci-environments](https://github.com/cypress-io/cypress-test-ci-environments) |
| [![CircleCI](https://circleci.com/gh/cypress-io/cypress-test-module-api.svg?style=svg&circle-token=317f79ae796e0ffd6cc7dd90859c0f67e5a306e7)](https://circleci.com/gh/cypress-io/cypress-test-module-api) | [cypress-test-module-api](https://github.com/cypress-io/cypress-test-module-api) |
| [![CircleCI](https://circleci.com/gh/cypress-io/cypress-test-nested-projects.svg?style=svg)](https://circleci.com/gh/cypress-io/cypress-test-nested-projects) | [cypress-test-nested-projects](https://github.com/cypress-io/cypress-test-nested-projects) |
| [![CircleCI](https://circleci.com/gh/cypress-io/cypress-on.svg?style=svg&circle-token=51ba85f5720654ee58212f45f6b9afc56d55d52a)](https://circleci.com/gh/cypress-io/cypress-on) | [cypress-on](https://github.com/cypress-io/cypress-on) |
| [![CircleCI](https://circleci.com/gh/cypress-io/cypress-test-node-versions.svg?style=svg&circle-token=6a7c4e7e7ab427e11bea6c2af3df29c4491d2376)](https://circleci.com/gh/cypress-io/cypress-test-node-versions) | [cypress-test-example-repos](https://github.com/cypress-io/cypress-test-example-repos) |
| [![CircleCI](https://circleci.com/gh/cypress-io/docsearch-scraper.svg?style=svg&circle-token=8087137233788ec1eab4f79d4451392ca53183b2)](https://circleci.com/gh/cypress-io/docsearch-scraper) | [docsearch-scraper](https://github.com/cypress-io/docsearch-scraper) |
| [![Docker Build Status](https://img.shields.io/docker/build/cypress/base.svg)](https://hub.docker.com/r/cypress/base/) | [cypress-docker-images](https://github.com/cypress-io/cypress-docker-images) |
| [![Build status](https://ci.appveyor.com/api/projects/status/ln8tg3dv42nk916c?svg=true)](https://ci.appveyor.com/project/cypress-io/cypress) | Windows CI |

## Code of Conduct

All contributors are expecting to abide by our [Code of Conduct](./CODE_OF_CONDUCT.md).
Expand Down
56 changes: 3 additions & 53 deletions __snapshots__/bump-spec.js
@@ -1,65 +1,15 @@
exports['list of all projects'] = [
{
"repo": "cypress-io/cypress-test-tiny",
"provider": "circle",
"platform": "win32"
},
{
"repo": "cypress-io/cypress-test-example-repos",
"provider": "circle",
"platform": "win32"
},
{
"repo": "cypress-io/cypress-test-tiny",
"provider": "circle",
"platform": "linux"
},
{
"repo": "cypress-io/cypress-test-module-api",
"provider": "circle",
"platform": "linux"
},
{
"repo": "cypress-io/cypress-test-node-versions",
"provider": "circle",
"platform": "linux"
},
{
"repo": "cypress-io/cypress-test-nested-projects",
"provider": "circle",
"platform": "linux"
},
{
"repo": "cypress-io/cypress-test-ci-environments",
"provider": "circle",
"platform": "linux"
},
{
"repo": "cypress-io/cypress-test-example-repos",
"provider": "circle",
"platform": "linux"
},
{
"repo": "cypress-io/cypress-test-tiny",
"provider": "circle",
"platform": "darwin"
},
{
"repo": "cypress-io/cypress-test-example-repos",
"provider": "circle",
"platform": "darwin"
}
]

exports['should have just circle and darwin projects'] = [
{
"repo": "cypress-io/cypress-test-tiny",
"provider": "circle",
"platform": "darwin"
},
exports['should have just circle and linux projects'] = [
{
"repo": "cypress-io/cypress-test-example-repos",
"repo": "cypress-io/cypress-test-module-api",
"provider": "circle",
"platform": "darwin"
"platform": "linux"
}
]
2 changes: 1 addition & 1 deletion browser-versions.json
@@ -1,4 +1,4 @@
{
"chrome:beta": "99.0.4844.27",
"chrome:stable": "98.0.4758.80"
"chrome:stable": "98.0.4758.102"
}

0 comments on commit 47b1f38

Please sign in to comment.