Skip to content

develop to master auto PR #2849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 3, 2020
Merged

develop to master auto PR #2849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4de7f91
add 'Cypress-Pro' plugin link
mbolotov Apr 25, 2020
fc7aa68
Merge branch 'develop' into develop
mbolotov Apr 28, 2020
d31928d
Merge branch 'develop' into develop
mbolotov May 12, 2020
88c8ced
add 'Cypress-Pro' plugin link
mbolotov May 12, 2020
de6926d
Merge remote-tracking branch 'origin/develop' into develop
mbolotov May 12, 2020
d1149f2
add 'Cypress-Pro' plugin link
mbolotov Jun 1, 2020
8ccaeef
Merge branch 'develop' into develop
mbolotov Jun 1, 2020
a7c6e92
Merge branch 'develop' into develop
mbolotov Jun 2, 2020
71275f7
Merge branch 'develop' into develop
bencodezen Jun 3, 2020
c3347d2
Merge pull request #2747 from mbolotov/develop
bencodezen Jun 3, 2020
b1df388
Expand support files to include TypeScript file ext (#2845)
jennifer-shehane Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/guides/references/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ cypress run --browser firefox --config viewportWidth=1280,viewportHeight=720
For more complex configuration objects, you may want to consider passing a {% url "JSON.stringified" https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify %} object surrounded by single quotes.

```shell
cypress open --config '{"watchForFileChanges":false,"testFiles":["**/*.js","**/*.coffee"]}'
cypress open --config '{"watchForFileChanges":false,"testFiles":["**/*.js","**/*.ts"]}'
```

## Plugins
Expand Down
3 changes: 2 additions & 1 deletion source/guides/references/error-messages.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@ It's still useful to load a setup file before your test code. If you are setting
To include code before your test files, set the {% url `supportFile` configuration#Folders-Files %} path. By default, {% url `supportFile` configuration#Folders-Files %} is set to look for one of the following files:

- `cypress/support/index.js`
- `cypress/support/index.ts`
- `cypress/support/index.coffee`

Just like with your test files, the {% url `supportFile` configuration#Folders-Files %} can use ES2015+ (or CoffeeScript) and modules, so you can import/require other files as needed.
Just like with your test files, the {% url `supportFile` configuration#Folders-Files %} can use ES2015+, {% url "TypeScript" typescript-support %} or CoffeeScript and modules, so you can import/require other files as needed.

# Command Errors

Expand Down
3 changes: 2 additions & 1 deletion source/guides/tooling/IDE-integration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ There are many third-party IDE extensions and plugins to help integrate your IDE

Compatible with IntelliJ IDEA, AppCode, CLion, GoLand, PhpStorm, PyCharm, Rider, RubyMine, and WebStorm.

- {% url "Intellij-Cypress" https://plugins.jetbrains.com/plugin/13819-intellij-cypress %}: Integrates Cypress under the common Intellij test framework.
- {% url "Cypress Support" https://plugins.jetbrains.com/plugin/13819-intellij-cypress %}: Integrates Cypress under the common Intellij test framework.
- {% url "Cypress Support Pro" https://plugins.jetbrains.com/plugin/13987-cypress-pro %}: An improved version of Cypress Support plugin with debugging from the IDE, advanced autocomplete and other features.

# Intelligent Code Completion

Expand Down