Skip to content

Commit

Permalink
Merge branch 'develop' into issue-4022
Browse files Browse the repository at this point in the history
  • Loading branch information
jennifer-shehane authored Dec 18, 2019
2 parents 549cf68 + 8d72901 commit 4dd4a4d
Show file tree
Hide file tree
Showing 811 changed files with 51,713 additions and 36,065 deletions.
7 changes: 6 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
**/dist
**/dist-test
**/node_modules
**/support/fixtures
**/support/fixtures/*
!**/support/fixtures/projects
**/support/fixtures/projects/**/_fixtures/*
**/support/fixtures/projects/**/*.jsx
**/support/fixtures/projects/**/jquery.js
**/support/fixtures/projects/**/fail.js
**/test/fixtures
**/vendor

Expand Down
4 changes: 3 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@
"extends": [
"plugin:@cypress/dev/general"
],
"rules": {}
"rules": {
"prefer-spread": "off"
}
}
File renamed without changes.
43 changes: 43 additions & 0 deletions .github/PULL_REQUEST_REVIEW_COMMENT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!--
this comment will be posted automatically by Cypress bot whenever someone opens a pull request,
and it helps the reviewer from Cypress team to ensure the change is solid.
-->
Thanks for the contribution! Below are some guidelines Cypress uses when doing PR reviews.

- Please write \`[WIP]\` in the title of your Pull Request if your PR is not ready for review - someone will review your PR as soon as the \`[WIP]\` is removed.
- Please familiarize yourself with the PR Review Checklist and feel free to make updates on your PR based on these guidelines.

## PR Review Checklist

If any of the following requirements can't be met, leave a comment in the review selecting 'Request changes', otherwise 'Approve'.

### User Experience

- The feature/bugfix is self-documenting from within the product.
- The change provides the end user with a way to fix their problem (no dead ends).

### Functionality

- The code works and performs its intended function with the correct logic.
- Performance has been factored in (for example, the code cleans up after itself to not cause memory leaks).
- The code guards against edge cases and invalid input and has tests to cover it.

### Maintainability

- The code is readable (too many nested 'if's are a bad sign).
- Names used for variables, methods, etc, clearly describe their function.
- The code is easy to understood and there are relevant comments explaining.
- New algorithms are documented in the code with link(s) to external docs (flowcharts, w3c, chrome, firefox).
- There are comments containing link(s) to the addressed issue (in tests and code).

### Quality

- The change does not reimplement code.
- There's not a module from the ecosystem that should be used instead.
- There is no redundant or duplicate code.
- There are no irrelevant comments left in the code.
- Tests are testing the code’s intended functionality in the best way possible.

### Internal

- The original issue has been tagged with a release in ZenHub.
18 changes: 18 additions & 0 deletions .github/PULL_REQUEST_REVIEW_COMMENT_FOR_DEPENDENCY_UPDATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!--
this comment will be posted automatically by Cypress bot whenever a dependency update pull request is opened,
and it helps the reviewer from Cypress team to ensure the update won't have unexpected consequences.
-->
Below are some guidelines Cypress uses when reviewing dependency updates.

## Dependency Update Instructions

- Read through the entire changelog of the dependency's changes. If a changelog is not available, check every commit made to the dependency. **NOTE** - do not rely on semver to indicate breaking changes - every product does not follow this standard.
- Add a PR review comment noting any relevant changes in the dependency.
- If any of the following requirements cannot be met, leave a comment in the review selecting 'Request changes', otherwise 'Approve'.

## Dependency Updates Checklist

- Code using the dependency has been updated to accommodate any breaking changes
- The dependency still supports the version of Node that the package requires.
- The PR been tagged with a release in ZenHub.
- Appropriate labels have been added to the PR (for example: label \`type: breaking change\` if it is a breaking change)
44 changes: 44 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<!--
Thanks for contributing!
Read our contribution guidelines here:
https://github.com/cypress-io/cypress/blob/develop/.github/CONTRIBUTING.md
-->

<!-- Example: "Closes #1234" -->

- Closes <!-- issue number here -->

### User facing changelog

<!--
Explain the change(s) for every user to read in our changelog.
-->

### Additional details

<!--
Examples:
- Why was this change necessary?
- What is affected by this change?
- Any implementation details to explain?
-->

### How has the user experience changed?

<!--
Provide before and after examples of the change.
Screenshots or GIFs are preferred.
-->

### PR Tasks

<!--
These tasks must be completed before a PR is merged.
Delete tasks if they are not applicable.
-->

- [ ] Have tests been added/updated?
- [ ] Has the original issue been tagged with a release in ZenHub? <!-- (internal team only)-->
- [ ] Has a PR for user-facing changes been opened in [`cypress-documentation`](https://github.com/cypress-io/cypress-documentation)? <!-- Link to PR here -->
- [ ] Have API changes been updated in the [`type definitions`](cli/types/index.d.ts)?
- [ ] Have new configuration options been added to the [`cypress.schema.json`](cli/schema/cypress.schema.json)?
7 changes: 1 addition & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,14 @@ Cached Theme Material Design.pak
packages/https-proxy/ca/

# from desktop-gui
packages/desktop-gui/cypress/videos
packages/desktop-gui/src/jsconfig.json

# from driver
packages/driver/test/cypress/videos

# from example
packages/example/app
packages/example/build
packages/example/cypress

# from driver
packages/driver/test/cypress/videos

# from server
packages/server/.cy
packages/server/.projects
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.9.3
12.0.0
10 changes: 10 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,14 @@
},
],
"eslint.enable": true,
// this project does not use Prettier
// thus set all settings to disable accidentally running Prettier
"prettier.requireConfig": true,
"prettier.disableLanguages": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
"json"
]
}
2 changes: 1 addition & 1 deletion .vscode/terminals.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"onlySingle": true,
"execute": false,
"cwd": "[cwd]/packages/server",
"command": "npm run test-e2e -- --spec name"
"command": "npm run test-e2e -- --spec [fileBasename]"
},
{
"name": "packages/runner watch",
Expand Down
Loading

0 comments on commit 4dd4a4d

Please sign in to comment.