Skip to content

Commit

Permalink
Merge branch 'develop' into fix/some-vite-love
Browse files Browse the repository at this point in the history
  • Loading branch information
lmiller1990 authored Jul 26, 2021
2 parents c1ed4ce + b3dd061 commit e0d2a49
Show file tree
Hide file tree
Showing 184 changed files with 7,593 additions and 2,753 deletions.
5 changes: 4 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
29 changes: 0 additions & 29 deletions .github/ISSUE_TEMPLATE/1-bug-report.md

This file was deleted.

42 changes: 42 additions & 0 deletions .github/ISSUE_TEMPLATE/1-bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: "🐛 Bug report"
description: Report a bug found while using Cypress.
body:
- type: markdown
attributes:
value: |
Have a question? 👉 [Start a new discussion](https://github.com/cypress-io/cypress/discussions) or [ask in chat](https://on.cypress.io/discord).
- type: textarea
id: current-behavior
attributes:
label: Current behavior
description: A description including screenshots, stack traces, DEBUG logs, etc. [Troubleshooting tips](https://on.cypress.io/troubleshooting).
placeholder: Currently...
validations:
required: true
- type: textarea
id: desired-behavior
attributes:
label: Desired behavior
description: Remember, we're not familiar with the app you're testing, so please provide a clear description of what should happen.
placeholder: In this situation, Cypress should...
- type: textarea
id: reproduction
attributes:
label: Test code to reproduce
description: Provide a failing test or repo we can run. You can fork [this repo](https://github.com/cypress-io/cypress-test-tiny), set up a failing test, then link to your fork.
placeholder: Here is my failing test code and the app code to run the tests on...
validations:
required: true
- type: input
id: version
attributes:
label: Cypress Version
description: Run `cypress version` to see your current version. If possible, please update Cypress to the latest version first.
placeholder: ex. 7.6.0
validations:
required: true
- type: textarea
id: other
attributes:
label: Other
placeholder: Any other details?
42 changes: 0 additions & 42 deletions .github/ISSUE_TEMPLATE/2-install-issue.md

This file was deleted.

60 changes: 60 additions & 0 deletions .github/ISSUE_TEMPLATE/2-install-issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: "⬇️ Issue during install"
description: Report an issue while downloading Cypress.
labels: ['topic: installation']
body:
- type: markdown
attributes:
value: |
Have a question? 👉 [Start a new discussion](https://github.com/cypress-io/cypress/discussions) or [ask in chat](https://on.cypress.io/discord).
If you're behind a corporate proxy, make sure to [configure it properly](https://on.cypress.io/proxy-configuration) before install.
- type: textarea
id: current-behavior
attributes:
label: Current behavior
description: A description including screenshots, stack traces, DEBUG logs, etc. [Troubleshooting tips](https://on.cypress.io/troubleshooting).
placeholder: When I try to download Cypress...
validations:
required: true
- type: textarea
id: debug-logs
attributes:
label: Debug logs
description: Include DEBUG logs setting [`DEBUG=cypress:*`](https://on.cypress.io/troubleshooting#Print-DEBUG-logs/). Include npm/yarn logs if applicable.
placeholder: Debug logs
- type: input
id: version
attributes:
label: Cypress Version
description: The version you're trying to install
placeholder: ex. 7.6.0
validations:
required: true
- type: dropdown
id: package-manager
attributes:
label: Package Manager
options:
- npm
- yarn
- Direct download
- pnpm
- other
validations:
required: true
- type: dropdown
id: operating-system
attributes:
label: Operating system
options:
- Linux
- Mac
- Windows
- other
validations:
required: true
- type: textarea
id: other
attributes:
label: Other
placeholder: Any other details?
19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/3-feature.md

This file was deleted.

26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/3-feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: "✨ Feature"
description: Suggest a feature or enhancement to improve Cypress.
body:
- type: markdown
attributes:
value: |
Have a question? 👉 [Start a new discussion](https://github.com/cypress-io/cypress/discussions) or [ask in chat](https://on.cypress.io/discord).
- type: textarea
id: feature
attributes:
label: What would you like?
description: A clear description of the feature or enhancement wanted in Cypress.
placeholder: I'd like to be able to...
validations:
required: true
- type: textarea
id: reason
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...
- type: textarea
id: other
attributes:
label: Other
placeholder: Any other details?
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ contact_links:
- name: 🤔 Questions and Help
url: https://github.com/cypress-io/cypress/discussions
about: This issue tracker is not for support questions. Please refer to our Discussions.
- name: 📊 Cypress Dashboard Feature
url: https://portal.productboard.com/cypress-io/1-cypress-dashboard
about: This issue tracker is not for requesting Cypress Dashboard features. Please express interest here.
- name: 💬 Chat
url: https://on.cypress.io/discord
about: Want to discuss Cypress with others? Check out our chat.
- name: 📃 Documentation Issue
url: https://github.com/cypress-io/cypress-documentation/issues/new
about: This issue tracker is not for documentation issues. Please open documentation issues here.
Expand Down
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,13 @@ Here is a list of the core packages in this repository with a short description,
| [reporter](./packages/reporter) | `@packages/reporter` | The reporter shows the running results of the tests (The Command Log UI). |
| [root](./packages/root) | `@packages/root` | Dummy package pointing at the root of the repository. |
| [runner](./packages/runner) | `@packages/runner` | The runner is the minimal "chrome" around the user's application under test. |
| [runner-ct](./packages/runner-ct) | `@packages/runner-ct` | The runner for component testing |
| [runner-shared](./packages/runner-shared) | `@packages/runner-shared` | The shared components between the `runner` and the `runner-ct` packages |
| [server](./packages/server) | `@packages/server` | The <3 of Cypress. This orchestrates everything. The backend node process. |
| [socket](./packages/socket) | `@packages/socket` | A wrapper around socket.io to provide common libraries. |
| [static](./packages/static) | `@packages/static` | Serves static assets used in the Cypress GUI. |
| [ts](./packages/ts) | `@packages/ts` | A centralized version of typescript. |

Public packages live within the [`npm`](./npm) folder and are standalone modules that get independently published to npm under the `@cypress/` namespace. These packages generally contain extensions, plugins, or other packages that are complementary to, yet independent of, the main Cypress app.

Here is a list of the npm packages in this repository:
Expand Down
4 changes: 2 additions & 2 deletions browser-versions.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"chrome:beta": "92.0.4515.93",
"chrome:stable": "91.0.4472.114"
"chrome:beta": "92.0.4515.107",
"chrome:stable": "92.0.4515.107"
}
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ commands:
# Deps needed by circle-cache.js, before we "yarn" or unpack cached node_modules
name: Cache Helper Deps
working_directory: ~/
command: npm i globby fs-extra minimist fast-json-stable-stringify
command: npm i globby@11.0.4 fs-extra@10.0.0 minimist@1.2.5 fast-json-stable-stringify@2.1.0

install-required-node:
# https://discuss.circleci.com/t/switch-nodejs-version-on-machine-executor-solved/26675/2
Expand Down
6 changes: 4 additions & 2 deletions cli/NPM_README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# Cypress

Fast, easy and reliable testing for anything that runs in a browser.

## What is this?

Cypress comes packaged as an `npm` module, which is all you need to get started.
[Cypress](https://www.cypress.io/) comes packaged as an `npm` module, which is all you need to get started testing.

After installing you'll be able to:

Expand All @@ -12,7 +14,7 @@ After installing you'll be able to:

## Install

Requires Node version >= 10.0.0
Please check our [system requirements](https://on.cypress.io/installing-cypress).

```sh
npm install --save-dev cypress
Expand Down
4 changes: 2 additions & 2 deletions cli/__snapshots__/cli_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ exports['shows help for run --foo 1'] = `
-e, --env <env> sets environment variables. separate multiple values with a comma. overrides any value in cypress.json or cypress.env.json
--group <name> a named group for recorded runs in the Cypress Dashboard
-k, --key <record-key> your secret Record Key. you can omit this if you set a CYPRESS_RECORD_KEY environment variable.
--headed displays the browser instead of running headlessly (defaults to true for Firefox and Chromium-family browsers)
--headless hide the browser instead of running headed (defaults to true for Electron)
--headed displays the browser instead of running headlessly
--headless hide the browser instead of running headed (default for cypress run)
--no-exit keep the browser open after tests finish
--parallel enables concurrent runs and automatic load balancing of specs across multiple machines or processes
-p, --port <port> runs Cypress on a specific port. overrides any value in cypress.json.
Expand Down
4 changes: 2 additions & 2 deletions cli/lib/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ const descriptions = {
forceInstall: 'force install the Cypress binary',
global: 'force Cypress into global mode as if its globally installed',
group: 'a named group for recorded runs in the Cypress Dashboard',
headed: 'displays the browser instead of running headlessly (defaults to true for Firefox and Chromium-family browsers)',
headless: 'hide the browser instead of running headed (defaults to true for Electron)',
headed: 'displays the browser instead of running headlessly',
headless: 'hide the browser instead of running headed (default for cypress run)',
key: 'your secret Record Key. you can omit this if you set a CYPRESS_RECORD_KEY environment variable.',
parallel: 'enables concurrent runs and automatic load balancing of specs across multiple machines or processes',
port: 'runs Cypress on a specific port. overrides any value in cypress.json.',
Expand Down
11 changes: 11 additions & 0 deletions cli/lib/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,20 @@ const util = {
.mapValues((value) => { // stringify to 1 or 0
return value ? '1' : '0'
})
.extend(util.getOriginalNodeOptions(options))
.value()
},

getOriginalNodeOptions (options) {
if (process.env.NODE_OPTIONS) {
return {
ORIGINAL_NODE_OPTIONS: process.env.NODE_OPTIONS,
}
}

return {}
},

getForceTty () {
return {
FORCE_STDIN_TTY: util.isTty(process.stdin.fd),
Expand Down
Loading

0 comments on commit e0d2a49

Please sign in to comment.