mirror of
https://github.com/cypress-io/cypress.git
synced 2026-01-05 22:19:46 -06:00
merge in develop root level diff
This commit is contained in:
5
.github/CODEOWNERS
vendored
5
.github/CODEOWNERS
vendored
@@ -1,6 +1,7 @@
|
||||
# Each line is a file pattern followed by one or more owners.
|
||||
|
||||
# Test Runner team are owners of code within root packages and cli
|
||||
# Test Runner team are owners of code within root packages concerning e2e, cli, and other utils
|
||||
/.github/ @cypress-io/test-runner
|
||||
/browser-versions.json @cypress-io/test-runner
|
||||
/cli/ @cypress-io/test-runner
|
||||
/packages/coffee/ @cypress-io/test-runner
|
||||
@@ -19,9 +20,11 @@
|
||||
/packages/rewriter/ @cypress-io/test-runner
|
||||
/packages/root/ @cypress-io/test-runner
|
||||
/packages/runner/ @cypress-io/test-runner
|
||||
/packages/runner-shared/ @cypress-io/test-runner
|
||||
/packages/server/ @cypress-io/test-runner
|
||||
/packages/socket/ @cypress-io/test-runner
|
||||
/packages/static/ @cypress-io/test-runner
|
||||
/packages/ts/ @cypress-io/test-runner
|
||||
/packages/ui-components/ @cypress-io/test-runner
|
||||
/packages/web-config/ @cypress-io/test-runner
|
||||
/scripts/ @cypress-io/test-runner
|
||||
|
||||
2
.github/ISSUE_TEMPLATE/1-bug-report.yml
vendored
2
.github/ISSUE_TEMPLATE/1-bug-report.yml
vendored
@@ -36,7 +36,7 @@ body:
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: othter
|
||||
id: other
|
||||
attributes:
|
||||
label: Other
|
||||
placeholder: Any other details?
|
||||
2
.github/ISSUE_TEMPLATE/2-install-issue.yml
vendored
2
.github/ISSUE_TEMPLATE/2-install-issue.yml
vendored
@@ -54,7 +54,7 @@ body:
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: othter
|
||||
id: other
|
||||
attributes:
|
||||
label: Other
|
||||
placeholder: Any other details?
|
||||
7
.github/ISSUE_TEMPLATE/3-feature.yml
vendored
7
.github/ISSUE_TEMPLATE/3-feature.yml
vendored
@@ -18,4 +18,9 @@ body:
|
||||
attributes:
|
||||
label: Why is this needed?
|
||||
description: Remember, we're not familiar with the app you're testing, so please provide a clear description of why this would be useful to your project.
|
||||
placeholder: I want this because...
|
||||
placeholder: I want this because...
|
||||
- type: textarea
|
||||
id: other
|
||||
attributes:
|
||||
label: Other
|
||||
placeholder: Any other details?
|
||||
@@ -1 +1 @@
|
||||
14.17.0
|
||||
14.16.0
|
||||
|
||||
@@ -8,7 +8,7 @@ branches:
|
||||
# https://www.appveyor.com/docs/lang/nodejs-iojs/
|
||||
environment:
|
||||
# use matching version of Node.js
|
||||
nodejs_version: "14.17.0"
|
||||
nodejs_version: "14.16.0"
|
||||
# encode secure variables which will NOT be used
|
||||
# in pull requests
|
||||
# https://www.appveyor.com/docs/build-configuration/#secure-variables
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"chrome:beta": "92.0.4515.93",
|
||||
"chrome:beta": "92.0.4515.101",
|
||||
"chrome:stable": "91.0.4472.114"
|
||||
}
|
||||
|
||||
22
circle.yml
22
circle.yml
@@ -49,7 +49,7 @@ executors:
|
||||
# the Docker image with Cypress dependencies and Chrome browser
|
||||
cy-doc:
|
||||
docker:
|
||||
- image: cypress/browsers:node14.17.0-chrome91-ff89
|
||||
- image: cypress/browsers:node14.16.0-chrome90-ff88
|
||||
# by default, we use "small" to save on CI costs. bump on a per-job basis if needed.
|
||||
resource_class: small
|
||||
environment:
|
||||
@@ -58,7 +58,7 @@ executors:
|
||||
# Docker image with non-root "node" user
|
||||
non-root-docker-user:
|
||||
docker:
|
||||
- image: cypress/browsers:node14.17.0-chrome91-ff89
|
||||
- image: cypress/browsers:node14.16.0-chrome90-ff88
|
||||
user: node
|
||||
environment:
|
||||
PLATFORM: linux
|
||||
@@ -1126,7 +1126,6 @@ jobs:
|
||||
|
||||
runner-integration-tests-electron:
|
||||
<<: *defaults
|
||||
resource_class: medium
|
||||
parallelism: 2
|
||||
steps:
|
||||
- run-runner-integration-tests:
|
||||
@@ -1219,19 +1218,6 @@ jobs:
|
||||
# we don't really need any artifacts - we are only interested in visual screenshots
|
||||
- store-npm-logs
|
||||
|
||||
run-launchpad-ct-tests:
|
||||
<<: *defaults
|
||||
steps:
|
||||
- restore_cached_workspace
|
||||
- run:
|
||||
command: yarn cypress:run:ct
|
||||
working_directory: packages/launchpad
|
||||
- store_test_results:
|
||||
path: /tmp/cypress
|
||||
- store_artifacts:
|
||||
path: /tmp/artifacts
|
||||
- store-npm-logs
|
||||
|
||||
reporter-integration-tests:
|
||||
<<: *defaults
|
||||
resource_class: medium
|
||||
@@ -2040,9 +2026,6 @@ linux-workflow: &linux-workflow
|
||||
- desktop-gui-component-tests:
|
||||
requires:
|
||||
- build
|
||||
- run-launchpad-ct-tests:
|
||||
requires:
|
||||
- build
|
||||
- reporter-integration-tests:
|
||||
requires:
|
||||
- build
|
||||
@@ -2106,7 +2089,6 @@ linux-workflow: &linux-workflow
|
||||
- reporter-integration-tests
|
||||
- Linux lint
|
||||
- desktop-gui-component-tests
|
||||
- run-launchpad-ct-tests
|
||||
- desktop-gui-integration-tests-2x
|
||||
- runner-ct-integration-tests-chrome
|
||||
- runner-integration-tests-firefox
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"minimist": "1.2.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"electron": "13.1.6",
|
||||
"electron": "12.0.0-beta.14",
|
||||
"execa": "4.1.0",
|
||||
"mocha": "3.5.3"
|
||||
},
|
||||
|
||||
@@ -17082,10 +17082,10 @@ electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.378, electron-to-chromi
|
||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"
|
||||
integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==
|
||||
|
||||
electron@13.1.6:
|
||||
version "13.1.6"
|
||||
resolved "https://registry.npmjs.org/electron/-/electron-13.1.6.tgz#6ecaf969255d62ce82cc0b5c948bf26e7dfb489b"
|
||||
integrity sha512-XiB55/JTaQpDFQrD9pulYnOGwaWeMyRIub5ispvoE2bWBvM5zVMLptwMLb0m3KTMrfSkzhedZvOu7fwYvR7L7Q==
|
||||
electron@12.0.0-beta.14:
|
||||
version "12.0.0-beta.14"
|
||||
resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.0-beta.14.tgz#f8c40c7e479879c305e519380e710c0a357aa734"
|
||||
integrity sha512-PYM+EepIEj9kLePXEb9gIxzZk5H4zM7LGg5iw60OHt+SYEECPNFJmPj3N6oHKu3W+KrCG7285Vgz2ZCp1u0kKA==
|
||||
dependencies:
|
||||
"@electron/get" "^1.0.1"
|
||||
"@types/node" "^14.6.2"
|
||||
|
||||
Reference in New Issue
Block a user