Skip to content
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.

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

feat: component testing #14479

Merged
merged 511 commits into from
Feb 4, 2021
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
511 commits
Select commit Hold shift + click to select a range
4240232
convert packages socket -> ts, upgrade socket.io to 3.x.x
brian-mann Jan 5, 2021
39cd18a
replace browserify with webpack in packages/extension
brian-mann Jan 5, 2021
342b05c
finished consolidating and refactoring socket-base, socket-e2e, and s…
brian-mann Jan 5, 2021
3ff21b9
use automation api's to reset server state and browser state before e…
brian-mann Jan 5, 2021
b73871d
remove custom parser
brian-mann Jan 5, 2021
3ba598b
remove additional circularParser ref
brian-mann Jan 5, 2021
116fdf2
types: fix types (#14401)
lmiller1990 Jan 5, 2021
f4f07df
fix: add xhrs
lmiller1990 Jan 5, 2021
a58228a
wip: work on linting
lmiller1990 Jan 5, 2021
50fce54
chore: linting
lmiller1990 Jan 5, 2021
93a8085
convert lib/automation into typescript
brian-mann Jan 5, 2021
ca0a7d1
convert automation/screenshot into typescript
brian-mann Jan 5, 2021
97c3dbf
convert automation/cookies into typescript
brian-mann Jan 5, 2021
70d7dd2
let -> const
brian-mann Jan 5, 2021
ef7dc68
create ensureProp class helper to validate that properties are available
brian-mann Jan 5, 2021
2192d3f
move around specific e2e method
brian-mann Jan 5, 2021
0be806f
fix a bunch of types, improve type completion
brian-mann Jan 5, 2021
5e26100
consolidate createRoutes
brian-mann Jan 5, 2021
7e6d19f
add ts-no-check again
brian-mann Jan 5, 2021
57208ef
dont check this file either
brian-mann Jan 5, 2021
16ed422
types: remove return type
lmiller1990 Jan 5, 2021
86b4503
fix failing tests, listen to 'error' not 'connect_error' event due to…
brian-mann Jan 6, 2021
2113d9e
dont use it.only
brian-mann Jan 6, 2021
277088a
fix: correctly use new for automation class
lmiller1990 Jan 6, 2021
b9951ae
properly bind the automation#response method so it has access to this…
brian-mann Jan 6, 2021
7e03f2b
fix: add missing get function
lmiller1990 Jan 6, 2021
94d561c
fix: use this to get correct ctx
lmiller1990 Jan 6, 2021
23e61d1
fix: use new screenshot class correctly
lmiller1990 Jan 6, 2021
b9f432e
reset the maxHttpBufferSize in socket.io server to be the previous v2
brian-mann Jan 6, 2021
54c9e14
tests: fix some tests
lmiller1990 Jan 6, 2021
9b103b9
set opts if undefined
brian-mann Jan 6, 2021
c8a287b
Merge branch 'spike/evergreen-automation-apis' of github.com:cypress-…
lmiller1990 Jan 6, 2021
81971a4
run the npm/vue tests in CI
brian-mann Jan 6, 2021
fae3624
werge branch 'spike/evergreen-automation-apis' of github.com:cypress-…
lmiller1990 Jan 6, 2021
aa03dd1
properly hook up netStubbing state to socket-ct, consolidate dupe cla…
brian-mann Jan 6, 2021
1fe4149
add cy.intercept() tests
brian-mann Jan 6, 2021
65dce64
export alias
brian-mann Jan 6, 2021
3f06c62
tests: do not use arrow function because it breaks things
lmiller1990 Jan 6, 2021
55b63e0
Merge branch 'spike/evergreen-automation-apis' of github.com:cypress-…
lmiller1990 Jan 6, 2021
ec0277b
fix function name typo
brian-mann Jan 6, 2021
f2de406
use the right working directory so {PWD} is correct
brian-mann Jan 6, 2021
e1972a3
type screenshotsFolder as string
brian-mann Jan 6, 2021
bc2adc8
fix: linting
lmiller1990 Jan 6, 2021
2a751b6
tests: stub correct value
lmiller1990 Jan 6, 2021
57dbd98
tests: fix gui unit tests
lmiller1990 Jan 6, 2021
8922969
tests: fix cookie test
lmiller1990 Jan 6, 2021
f974e69
wip: xdescribe tests for now
lmiller1990 Jan 7, 2021
31a6148
chore: fixing the socket unit tests w ts-mocha
JessicaSachs Jan 7, 2021
7a21e50
Merge branch 'spike/evergreen-automation-apis' of github.com:cypress-…
JessicaSachs Jan 7, 2021
f7420d1
update circular json patch for socket.io v4
flotwig Jan 7, 2021
364a59a
nohoist
flotwig Jan 7, 2021
0ce67d3
tests: call listenWebsockets in tests
lmiller1990 Jan 7, 2021
5925215
Merge branch 'spike/evergreen-automation-apis' of github.com:cypress-…
lmiller1990 Jan 7, 2021
6158393
chore: fixing the server unit tests by stubbing out process.versions.…
JessicaSachs Jan 7, 2021
e30dd07
Merge branch 'spike/evergreen-automation-apis' of github.com:cypress-…
JessicaSachs Jan 7, 2021
5a49c1f
tests: ignore false positive in cypress spec when closing project
lmiller1990 Jan 7, 2021
f4a9852
Merge branch 'spike/evergreen-automation-apis' of github.com:cypress-…
lmiller1990 Jan 7, 2021
4090c50
tests: use automation constructor
lmiller1990 Jan 7, 2021
d0d8935
update isBuf to is-binary
flotwig Jan 7, 2021
866d25d
tests: spy correct prop
lmiller1990 Jan 7, 2021
58433a7
call the right isBinary method
brian-mann Jan 7, 2021
43029e3
fix: revert screenshot to be a plain function, fixing kitchen sink
lmiller1990 Jan 7, 2021
63b9f59
fix: types of screenshot
lmiller1990 Jan 7, 2021
c76ce37
chore: remove build files unintionally committed
lmiller1990 Jan 7, 2021
dd3f870
Merge branch 'screenshot-refactor' into spike/evergreen-automation-apis
lmiller1990 Jan 7, 2021
16c1e0f
tests: add socket tsconfig.json
lmiller1990 Jan 7, 2021
3dba316
fix double-encoding certain socket.io messages
flotwig Jan 7, 2021
df4ad93
chore: fixing launcher unit tests for OSX
JessicaSachs Jan 7, 2021
2c40ebc
chore: fixing extension unit tests
JessicaSachs Jan 7, 2021
446a6d7
chore: fixing https-proxy tests
JessicaSachs Jan 7, 2021
8dd988d
chore: fix hanging unit tests for runner
JessicaSachs Jan 7, 2021
496fdd6
types: fix some types (#14460)
lmiller1990 Jan 8, 2021
f6271f4
Merge in latest develop and resolve conflicts
lmiller1990 Jan 12, 2021
b8a6de1
specify socket.io-parser resolution, and ensure its not being hoisted
brian-mann Jan 11, 2021
f29d2d9
hard fix socket.io version dep for typescript d.ts file
brian-mann Jan 11, 2021
90bd098
add test-e2e terminals task
brian-mann Jan 11, 2021
046f2b6
set all debug versions, fix xvfb debug tests
brian-mann Jan 11, 2021
4274d3b
create terminal task for running yarn
brian-mann Jan 11, 2021
384fc73
fix linting warnings regarding it.only
lmiller1990 Jan 12, 2021
4d6c985
fixes types of deps
brian-mann Jan 11, 2021
e221420
correctly import fs utils
brian-mann Jan 11, 2021
d5b191e
set cwd forcibly when terminal opens
brian-mann Jan 11, 2021
0652d7e
properly nohoist babel-loader + ts-loader, and remove unnecessary /[r…
brian-mann Jan 11, 2021
67f423b
improves regexp matching to extract complex package names, adds tests
lmiller1990 Jan 12, 2021
97c7eb4
add a bunch of missing deps
brian-mann Jan 12, 2021
78f6276
generate the right packages/socket build files
brian-mann Jan 12, 2021
1a9ef9e
build tsc
brian-mann Jan 12, 2021
650bc34
make sure to build with tsc
brian-mann Jan 12, 2021
13356c2
build the right files, and include them in the final build
brian-mann Jan 12, 2021
d953c06
build the .js files for prod
brian-mann Jan 11, 2021
a8b6c14
move the server-ct tests into the tests folder
brian-mann Jan 11, 2021
3b57282
convert automation.js to ts
lmiller1990 Jan 12, 2021
82bca03
add default download folder directory
lmiller1990 Jan 12, 2021
ea18aee
correct fs import
lmiller1990 Jan 12, 2021
369d453
Fix socket hang up
dmtrKovalenko Jan 6, 2021
5397cfc
Fix socket hangup on intiial build
dmtrKovalenko Jan 8, 2021
cf71c31
Merge in socket hangup fix
dmtrKovalenko Jan 8, 2021
0f646ab
Apply codereview points
dmtrKovalenko Jan 11, 2021
eecf1f0
rebuild yarn.lock
lmiller1990 Jan 12, 2021
a8f5206
chore: enable component testing for local developers and CI
JessicaSachs Jan 12, 2021
e00f081
chore: Fixing react + vue component tests (#14514)
JessicaSachs Jan 12, 2021
c8ceaa1
fix: bring back support for support files
elevatebart Jan 12, 2021
9cba5ca
fix: remove two annoying react warnings
elevatebart Jan 12, 2021
1bfb613
add missing circular-json dep
brian-mann Jan 13, 2021
c3237f7
chore: tweak style to match mock up
lmiller1990 Jan 13, 2021
cf5fd53
chore: add max width
lmiller1990 Jan 13, 2021
ee8fbd2
modified socket.io parser patches, removed custom handling of circula…
brian-mann Jan 13, 2021
a2a001d
fix socket patch for when binary data has null prototype
brian-mann Jan 13, 2021
3ea6d7c
Update npm-react tests to run via CLI and use Xvfb
flotwig Jan 13, 2021
6467faf
Merge branch 'feat/component-testing' into ct-runner-style
lmiller1990 Jan 13, 2021
6df66a5
fix: when quitting chrome exit the process
elevatebart Jan 13, 2021
8152b3c
Merge branch 'feat/component-testing' into fix/evergreen-support-files
elevatebart Jan 13, 2021
5d385de
chore: removing an uncaught viewportWidth from react tests, xdescribe…
JessicaSachs Jan 13, 2021
0a10cdf
fix: use a reducer instead of a filter+map
elevatebart Jan 13, 2021
2d30ada
refactor: simplify the loader for support
elevatebart Jan 14, 2021
8803e6a
fix: load the absolute path of the import file
elevatebart Jan 14, 2021
692f218
chore: improve margin around iframe
lmiller1990 Jan 14, 2021
f3fa6ca
feat: display webpack compilation errors in browser
lmiller1990 Jan 14, 2021
00a5e8a
fix: clear error when webpack successfully compiles
lmiller1990 Jan 14, 2021
1d4cbcb
Merge pull request #14545 from cypress-io/chore/fix-ct-react
lmiller1990 Jan 14, 2021
4fceac8
fix: use different default viewport for component testing
lmiller1990 Jan 14, 2021
2d17b55
refactor: take feedback on multiple fronts
elevatebart Jan 14, 2021
29ba8ba
fix: split out the promise chain fix
elevatebart Jan 14, 2021
ffe6391
fix: make loading specs wait for Cypress init
elevatebart Jan 14, 2021
cec8949
refactor: loadSupport -> loadSupportFile
elevatebart Jan 14, 2021
4f7d09e
fix: add some logs to ct auto-exit
elevatebart Jan 14, 2021
16e2a8e
chore: fix whitespace and spelling error
lmiller1990 Jan 14, 2021
3aac39a
Merge pull request #14546 from cypress-io/ct-174-overlay
lmiller1990 Jan 14, 2021
fb8e71c
Merge pull request #14547 from cypress-io/default-component-testing-v…
lmiller1990 Jan 14, 2021
15a591f
Merge pull request #14516 from cypress-io/fix/evergreens-warnings
lmiller1990 Jan 14, 2021
17b8f13
Merge pull request #14570 from cypress-io/fix/evergreen-exit
lmiller1990 Jan 14, 2021
053ff82
refactor: use Bluebird instead of reduce
elevatebart Jan 14, 2021
4830084
feat: support passing a webpack config path
lmiller1990 Jan 15, 2021
f5acf6c
Merge branch 'develop' into feat/component-testing
lmiller1990 Jan 15, 2021
557e219
fix: update width when resizing
lmiller1990 Jan 15, 2021
b33bd27
fix: end process after ct run mode
lmiller1990 Jan 15, 2021
aa6c191
Merge pull request #14515 from cypress-io/fix/evergreen-support-files
elevatebart Jan 15, 2021
a3c270c
Update packages/server/lib/modes/run.js
lmiller1990 Jan 16, 2021
739a9e1
fix: exit with number of failed specs
lmiller1990 Jan 17, 2021
8e5a5db
chore: resolve conflicts
lmiller1990 Jan 17, 2021
b5a2361
Merge branch 'feat/component-testing' into exit-mode-ct-run-mode
lmiller1990 Jan 17, 2021
4b56847
Merge branch 'feat/component-testing' into ct-runner-style
lmiller1990 Jan 17, 2021
844ed86
chore: stub out process.exit
lmiller1990 Jan 18, 2021
e18e9b5
wip: make diff between component testing run/interactive clear
lmiller1990 Jan 18, 2021
e3fcb5d
chore: use same entry point for run/runComponent interactive/interact…
lmiller1990 Jan 18, 2021
865a7ae
chore: make e2e and component test modes more clear via naming
lmiller1990 Jan 18, 2021
af0efce
Merge branch 'exit-mode-ct-run-mode' of https://github.com/cypress-io…
brian-mann Jan 18, 2021
ff6cb54
refactored code, created dedicated entrypoints for e2e/ct modes
brian-mann Jan 18, 2021
1a9bd83
some cleanup to back out of unnecessary changes
brian-mann Jan 18, 2021
9292b9e
feat(component-testing): Move hmr stuff to the server (#14634)
dmtrKovalenko Jan 19, 2021
3cb2d05
Merge pull request #14517 from cypress-io/ct-runner-style
lmiller1990 Jan 19, 2021
3bb72f8
Merge pull request #14576 from cypress-io/ct/viewport-aut-resize-ct-192
lmiller1990 Jan 19, 2021
77cd12e
chore: import interactive correctly in tests
lmiller1990 Jan 19, 2021
869d727
chore: fix tests
lmiller1990 Jan 20, 2021
ec87901
chore: fix tests and update snapshot
lmiller1990 Jan 20, 2021
1b1d390
chore: simplify modes
lmiller1990 Jan 20, 2021
a60de7f
chore: merge in feat/component testing
lmiller1990 Jan 20, 2021
f5b613e
chore: fix cypress react hooks
lmiller1990 Jan 20, 2021
18f827a
chore: merge in develop and resolve conflicts
lmiller1990 Jan 20, 2021
bc467c0
Merge pull request #14579 from cypress-io/exit-mode-ct-run-mode
lmiller1990 Jan 20, 2021
7556e80
Merge branch 'feat/component-testing' into remove-webpack-magic-ct-198
lmiller1990 Jan 20, 2021
0e3d7fb
wip: fixing css
lmiller1990 Jan 20, 2021
86809cb
Merge branch 'feat/component-testing' into remove-webpack-magic-ct-198
lmiller1990 Jan 20, 2021
9526eaf
chore: use webpack object instead of path
lmiller1990 Jan 20, 2021
06cebd8
test: make cell test pass all the time
elevatebart Jan 20, 2021
6c09d22
fix: make cy.viewport not fail(no effect on width)
elevatebart Jan 20, 2021
fd1af0c
fix: simplify fix
elevatebart Jan 20, 2021
49a5725
test: re-enable viewport commands
elevatebart Jan 20, 2021
e4a9746
test: update react tests with viewport examples
elevatebart Jan 20, 2021
6c02435
fix: integrate lachlans feedback
elevatebart Jan 21, 2021
e7e859a
Merge pull request #14575 from cypress-io/remove-webpack-magic-ct-198
lmiller1990 Jan 21, 2021
8ece880
fix: use correct component testing command to kick off tests
lmiller1990 Jan 21, 2021
90b7cf8
chore: remove xdescribes
lmiller1990 Jan 21, 2021
8fb3b6c
fix(npm-react): typo in viewPort test
elevatebart Jan 21, 2021
91235b3
test(ct): move viewport in crossword example
elevatebart Jan 21, 2021
0a9ea0c
fix: error in tests
elevatebart Jan 21, 2021
53788be
Merge branch 'feat/component-testing' into fix/evergreen-viewport
elevatebart Jan 21, 2021
1fe1cfe
fix: make the viewport resizeable with drag & drop
elevatebart Jan 21, 2021
c27778e
fix: make vue runner work again ...
elevatebart Jan 21, 2021
ab55e83
chore: update yarn lock
elevatebart Jan 21, 2021
157fb5e
test: re-comment 2 tests that are supposed to fail
elevatebart Jan 21, 2021
be19591
fix: remove the container ref from app.tsx
elevatebart Jan 21, 2021
cad9ffe
test: use wrap instead of get for faster tests
elevatebart Jan 21, 2021
843acde
test: make the viewport test cleaner (nowrap)
elevatebart Jan 21, 2021
bdcb781
chore: include or remove otherwise xdescribed specs
lmiller1990 Jan 21, 2021
d6e185a
fix: remove change of viewport on resize
elevatebart Jan 21, 2021
79afc81
chore: run yarn and update yarn.lock
lmiller1990 Jan 21, 2021
589b18c
Merge pull request #14680 from cypress-io/ct/remove-x-describes
lmiller1990 Jan 22, 2021
e8c34b8
Merge pull request #14665 from cypress-io/fix/evergreen-viewport
elevatebart Jan 22, 2021
8e9d68e
feat(component-testing): React devtools for component testing (#14675)
dmtrKovalenko Jan 25, 2021
3cbe96a
fix: viewport styling and split pane widths
JessicaSachs Jan 27, 2021
50be1b5
refactor: improve spec list
lmiller1990 Jan 27, 2021
24e8036
refactor: improve spec list
lmiller1990 Jan 27, 2021
9f4ce51
refactor: use new components in runner-ct
lmiller1990 Jan 27, 2021
b5509a7
chore: remove old files
lmiller1990 Jan 27, 2021
2e809a2
refactor: move files around
lmiller1990 Jan 27, 2021
da6c14d
refactor: update imports
lmiller1990 Jan 27, 2021
1da7661
chore: remove examples
lmiller1990 Jan 27, 2021
64d4150
chore: lint
lmiller1990 Jan 27, 2021
655470f
chore: lint
lmiller1990 Jan 27, 2021
454983c
test: improve coverage of search specs
lmiller1990 Jan 27, 2021
13ffdb0
fix: styling and unwanted deps
JessicaSachs Jan 27, 2021
28ec7f9
test: add spec for selecting spec to run
lmiller1990 Jan 27, 2021
e598532
chore: do not use css vars
lmiller1990 Jan 27, 2021
def25e4
chore: remove only
lmiller1990 Jan 27, 2021
d2c78b1
yarn lock whoops
JessicaSachs Jan 27, 2021
5eaeb33
chore: merge in develop
lmiller1990 Jan 28, 2021
e89da7a
chore: merge in develop and resolve conflicts
lmiller1990 Jan 28, 2021
be688e7
chore: remove old index.js
lmiller1990 Jan 28, 2021
6d3f975
merge commit
JessicaSachs Jan 28, 2021
d4a888d
fix viewport styling
JessicaSachs Jan 29, 2021
c99a703
fix align for specs list container grid when there aren't enough spec…
JessicaSachs Jan 29, 2021
286b033
fix(component-testing): remove default export (#14812)
lmiller1990 Jan 29, 2021
c39d84b
chore: add correct icon for expanding directories
lmiller1990 Jan 29, 2021
13941fc
Merge pull request #14759 from cypress-io/feat/viewport-restyling
lmiller1990 Jan 29, 2021
cb9127e
fix: add back in download handling to automation
lmiller1990 Jan 29, 2021
3eb6f14
tests: add basic e2e tests for webpack-dev-server
lmiller1990 Jan 29, 2021
60158a2
chore: add webpack-dev-server to circle
lmiller1990 Jan 29, 2021
5595fed
chore: add comprehensive error message if dev-server is not registered
dmtrKovalenko Jan 29, 2021
23b8a6b
chore: fix linting in cy studio
elevatebart Jan 29, 2021
b5f021d
fix: spec tsx types and lint
elevatebart Jan 29, 2021
af0a9fd
make it a cleaner mount fix
elevatebart Jan 30, 2021
e8e8562
various fixes
elevatebart Jan 30, 2021
0842a42
Merge pull request #14820 from cypress-io/chore/error-if-plugins-not-…
lmiller1990 Jan 31, 2021
d51f897
chore: add webpack-dev-server to circle
lmiller1990 Jan 31, 2021
cdc76d3
make eslint plugin validate typescript & tsx
elevatebart Feb 1, 2021
c4b4e23
Merge pull request #14828 from cypress-io/chore/evergreen-lit-fix
lmiller1990 Feb 1, 2021
7cad4b0
Merge branch 'feat/component-testing' into add-tests-webpack-dev-server
lmiller1990 Feb 1, 2021
8d3c985
fix: destructure port from dev server resolved options
lmiller1990 Feb 1, 2021
81b9ad3
Merge pull request #14815 from cypress-io/add-tests-webpack-dev-server
lmiller1990 Feb 1, 2021
acb8b38
fix: fix server unit tests
lmiller1990 Feb 1, 2021
b0f324b
Merge branch 'feat/component-testing' of github.com:cypress-io/cypres…
lmiller1990 Feb 1, 2021
df2586d
Merge branch 'develop' into feat/component-testing
lmiller1990 Feb 1, 2021
4194523
fix start server event typings
elevatebart Feb 1, 2021
096afaa
align typings
elevatebart Feb 1, 2021
f20ab91
remove extraneous column
elevatebart Feb 1, 2021
79ec906
Use the types in vue/react examples
elevatebart Feb 1, 2021
5b94d57
type http server
elevatebart Feb 2, 2021
c1644b0
update dependencies on node types
elevatebart Feb 2, 2021
6dfaa23
Merge pull request #14855 from cypress-io/feat/evergreen-typings
elevatebart Feb 2, 2021
3ccbb91
remove eslint plugin no-only-tests
kuceb Feb 3, 2021
b76b8d6
add binary build to branch
kuceb Feb 3, 2021
cbcf0d4
use webpack for packages/extension build, small fixes
kuceb Feb 3, 2021
b67831b
Merge remote-tracking branch 'origin/develop' into feat/component-tes…
JessicaSachs Feb 3, 2021
d84e4e3
chore: update yarn.lock
lmiller1990 Feb 4, 2021
6d4cfdf
Revert "use webpack for packages/extension build, small fixes"
JessicaSachs Feb 4, 2021
eabd354
updating package-lock
JessicaSachs Feb 4, 2021
8e9261e
Merge branch 'develop' into feat/component-testing
JessicaSachs Feb 4, 2021
8250779
Merge remote-tracking branch 'origin/develop' into feat/component-tes…
JessicaSachs Feb 4, 2021
5ef3d13
syntax error
JessicaSachs Feb 4, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 4 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
"plugin:@cypress/dev/tests"
],
"rules": {
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-useless-constructor": "off",
"prefer-spread": "off",
"prefer-rest-params": "off"
"prefer-rest-params": "off",
"no-useless-constructor": "off"
flotwig marked this conversation as resolved.
Show resolved Hide resolved
},
"settings": {
"react": {
Expand Down
8 changes: 7 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"eslint.alwaysShowStatus": true,
"eslint.validate": ["json"],
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
"json"
],
"eslint.enable": true,
// this project does not use Prettier
// thus set all settings to disable accidentally running Prettier
Expand Down
39 changes: 39 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
Comment on lines +2 to +3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interesting, i wonder if we should convert our terminals.json to this format

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no idea - I don't use these at all, I guess someone else aded them. Might check it out and so I can start using vscode more effectively...

"version": "2.0.0",
"tasks": [
{
"label": "rename yarn workspace packages",
"type": "shell",
"command": "node ./scripts/rename-workspace-packages --file ${file}",
"presentation": {
"echo": true,
"reveal": "silent",
"focus": false,
"panel": "shared",
"showReuseMessage": true,
"clear": false
},
"problemMatcher": []
},
{
"label": "decaffeinate-bulk file",
"type": "shell",
"command": "yarn decaffeinate-bulk convert --file ${file}",
"problemMatcher": []
},
{
"label": "decaffeinate-bulk multiple files",
"type": "shell",
"command": "yarn decaffeinate-bulk convert --file ${file} ${file}",
"problemMatcher": []
},
{
"label": "decaffeinate-bulk dir",
"type": "shell",
"command": "yarn decaffeinate-bulk --dir ${fileDirname} convert",
"problemMatcher": []
}
]
}
35 changes: 33 additions & 2 deletions .vscode/terminals.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,43 @@
"autorun": false,
"terminals": [
{
"name": "cypress open",
"name": "yarn",
"focus": true,
"onlySingle": true,
"execute": true,
"cwd": "[cwd]",
"command": "yarn"
},
{
"name": "cypress open (E2E)",
"focus": true,
"onlySingle": true,
"execute": true,
"command": "yarn cypress:open"
},
{
"name": "cypress run",
"name": "cypress run (E2E)",
"focus": true,
"onlySingle": true,
"execute": false,
"command": "yarn cypress:run --project ../project"
},
{
"name": "cypress open (CT)",
"focus": true,
"onlySingle": true,
"execute": true,
"cwd": "[cwd]/packages/server-ct",
"command": "yarn cypress:open"
},
{
"name": "packages/server test-e2e",
"focus": true,
"onlySingle": true,
"execute": false,
"cwd": "[cwd]/packages/server",
"command": "yarn test-e2e [fileBasename]"
},
Comment on lines +34 to +41
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should work the same as packages/server test, so doesn't really need to be added

{
"name": "packages/server test-watch",
"focus": true,
Expand All @@ -38,6 +62,13 @@
"cwd": "[cwd]/packages/runner",
"command": "yarn watch"
},
{
"name": "packages/runner-ct watch",
"focus": true,
"onlySingle": true,
"cwd": "[cwd]/packages/runner-ct",
"command": "yarn watch"
},
{
"name": "packages/driver cypress open",
"focus": true,
Expand Down
44 changes: 43 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ macBuildFilters: &macBuildFilters
only:
- develop
- v6.0-release
- feat/component-testing
- include-electron-node-version

defaults: &defaults
Expand Down Expand Up @@ -37,6 +38,7 @@ testBinaryFirefox: &testBinaryFirefox
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- build-npm-package
- build-binary
Expand Down Expand Up @@ -643,6 +645,20 @@ jobs:
path: /tmp/cypress
- store-npm-logs

server-ct-unit-tests:
<<: *defaults
parallelism: 1
steps:
- attach_workspace:
at: ~/
- check-conditional-ci
- run: yarn test-unit --scope @packages/server-ct
- verify-mocha-results:
expectedResultCount: 1
- store_test_results:
path: /tmp/cypress
- store-npm-logs

Comment on lines +650 to +663
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so, unfortunately, we are over github's 100 checks/commit limit in develop...... this makes it urgent to find a way to cut down, as with every new job we add, the chance of another check randomly failing and going unreported increases

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Oof. We're gonna need to get on the phone and figure out how to do that.

server-integration-tests:
<<: *defaults
parallelism: 1
Expand Down Expand Up @@ -894,6 +910,16 @@ jobs:
working_directory: npm/webpack-preprocessor/examples/react-app
- store-npm-logs

npm-webpack-dev-server:
<<: *defaults
steps:
- attach_workspace:
at: ~/
- check-conditional-ci
- run:
name: Run tests
command: yarn workspace @cypress/webpack-dev-server test

Comment on lines +915 to +924
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto, would be nice to run this without adding a new job

npm-webpack-batteries-included-preprocessor:
<<: *defaults
steps:
Expand All @@ -915,7 +941,8 @@ jobs:
command: yarn workspace @cypress/vue build
- run:
name: Run tests
command: yarn workspace @cypress/vue test
command: yarn test
working_directory: npm/vue
- store-npm-logs

npm-react:
Expand Down Expand Up @@ -1720,6 +1747,9 @@ linux-workflow: &linux-workflow
requires:
- build

- npm-webpack-dev-server:
requires:
- build
- npm-webpack-preprocessor:
requires:
- build
Expand Down Expand Up @@ -1818,6 +1848,7 @@ linux-workflow: &linux-workflow
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- build
- test-kitchensink:
Expand All @@ -1836,6 +1867,7 @@ linux-workflow: &linux-workflow
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- build
- build-npm-package:
Expand All @@ -1848,6 +1880,7 @@ linux-workflow: &linux-workflow
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- build-npm-package
- build-binary:
Expand All @@ -1860,6 +1893,7 @@ linux-workflow: &linux-workflow
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- build-binary
- test-npm-module-on-minimum-node-version:
Expand Down Expand Up @@ -1917,6 +1951,7 @@ linux-workflow: &linux-workflow
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- upload-npm-package
- upload-binary
Expand All @@ -1927,6 +1962,7 @@ linux-workflow: &linux-workflow
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- upload-npm-package
- upload-binary
Expand All @@ -1936,6 +1972,7 @@ linux-workflow: &linux-workflow
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- build-npm-package
- build-binary
Expand All @@ -1946,6 +1983,7 @@ linux-workflow: &linux-workflow
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- build-npm-package
- build-binary
Expand All @@ -1972,6 +2010,7 @@ linux-workflow: &linux-workflow
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- build-npm-package
- build-binary
Expand Down Expand Up @@ -2066,6 +2105,7 @@ mac-workflow: &mac-workflow
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- Mac NPM package
- Mac binary
Expand All @@ -2079,6 +2119,7 @@ mac-workflow: &mac-workflow
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- Mac NPM package upload
- Mac binary upload
Expand All @@ -2092,6 +2133,7 @@ mac-workflow: &mac-workflow
only:
- develop
- v6.0-release
- feat/component-testing
requires:
- Mac NPM package upload
- Mac binary upload
Expand Down
1 change: 1 addition & 0 deletions cli/__snapshots__/cli_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ exports['shows help for open --foo 1'] = `
-P, --project <project-path> path to the project
--dev runs cypress in development and bypasses
binary check
-ct, --component-testing Cypress Component Testing mode (alpha)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs to go before release

-h, --help display help for command
-------
stderr:
Expand Down
2 changes: 2 additions & 0 deletions cli/lib/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ module.exports = {
.option('--global', text('global'))
.option('-p, --port <port>', text('port'))
.option('-P, --project <project-path>', text('project'))
.option('--run-project <project-path>', 'like `project`, but forces Cypress into runmode')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a run-ct command yet so this can be removed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep this is coming: #14902

.option('--dev', text('dev'), coerceFalse)
.action((opts) => {
debug('opening Cypress')
Expand All @@ -422,6 +423,7 @@ module.exports = {
.option('-p, --port <port>', text('port'))
.option('-P, --project <project-path>', text('project'))
.option('--dev', text('dev'), coerceFalse)
.option('-ct, --component-testing', 'Cypress Component Testing mode (alpha)')
.action((opts) => {
debug('opening Cypress')
require('./exec/open')
Expand Down
4 changes: 4 additions & 0 deletions cli/lib/exec/open.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ module.exports = {

if (isComponentTesting) {
args.push('--componentTesting')

if (options.runProject) {
args.push('--run-project', options.runProject)
}
}

debug('opening from options %j', options)
Expand Down
8 changes: 6 additions & 2 deletions cli/lib/exec/xvfb.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ const os = require('os')
const Promise = require('bluebird')
const Xvfb = require('@cypress/xvfb')
const { stripIndent } = require('common-tags')
const debug = require('debug')('cypress:cli')
const debugXvfb = require('debug')('cypress:xvfb')
const Debug = require('debug')
const { throwFormErrorText, errors } = require('../errors')
const util = require('../util')

const debug = Debug('cypress:cli')
const debugXvfb = Debug('cypress:xvfb')

debug.Debug = debugXvfb.Debug = Debug
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems it is useful for debugging (see line 23 in this file. it is exported). it is only referenced in one file, xvfb_spec.js. I am guessing it was added to debug a specific issue. Do you think we should remove it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


const xvfbOptions = {
timeout: 30000, // milliseconds
// need to explicitly define screen otherwise electron will crash
Expand Down
1 change: 1 addition & 0 deletions cli/lib/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ const parseOpts = (opts) => {
'reporter',
'reporterOptions',
'record',
'runProject',
'spec',
'tag')

Expand Down
3 changes: 2 additions & 1 deletion cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"@cypress/listr-verbose-renderer": "^0.4.1",
"@cypress/request": "^2.88.5",
"@cypress/xvfb": "^1.2.4",
"@types/node": "12.12.50",
"@types/sinonjs__fake-timers": "^6.0.1",
"@types/sizzle": "^2.3.2",
"arch": "^2.1.2",
Expand All @@ -35,7 +36,7 @@
"commander": "^5.1.0",
"common-tags": "^1.8.0",
"dayjs": "^1.9.3",
"debug": "^4.1.1",
"debug": "4.3.2",
"eventemitter2": "^6.4.2",
"execa": "^4.0.2",
"executable": "^4.1.1",
Expand Down
Loading