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.

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

feat: Use .config files #18578

Merged
merged 80 commits into from
Nov 2, 2021
+2,252 −1,094
Merged

feat: Use .config files #18578

Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
d6f172b
feat: Use .config files
estrada9166 Oct 21, 2021
09f5412
Merge branch 'unified-desktop-gui' of github.com:cypress-io/cypress i…
estrada9166 Oct 21, 2021
614ed50
Update cache
estrada9166 Oct 21, 2021
7b65e93
Replace cypress.json files for cypress.config.{ts|js}
estrada9166 Oct 21, 2021
cd16351
Update cypress.json usage for config file
estrada9166 Oct 22, 2021
16b7b1e
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-…
estrada9166 Oct 22, 2021
9e03d46
Update cypress.json usage for config file
estrada9166 Oct 22, 2021
cfb39a6
Merge branch 'alejandro/unified/use-config-file' of github.com:cypres…
estrada9166 Oct 22, 2021
936ede5
Fix some tests
estrada9166 Oct 22, 2021
1a41152
Merge branch 'unified-desktop-gui' of github.com:cypress-io/cypress i…
estrada9166 Oct 22, 2021
c143e92
Fix more tests
estrada9166 Oct 22, 2021
e598f48
Fix more tests
estrada9166 Oct 25, 2021
bec0ab1
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-…
estrada9166 Oct 25, 2021
1b35442
Fix more tests
estrada9166 Oct 25, 2021
efccb7e
Merge branch 'alejandro/unified/use-config-file' of github.com:cypres…
estrada9166 Oct 25, 2021
70f3be6
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-…
estrada9166 Oct 25, 2021
f944cbd
Fix more tests
estrada9166 Oct 25, 2021
51859db
Attempt to fix CI projects
estrada9166 Oct 26, 2021
1864cec
Fix CircleCI
estrada9166 Oct 26, 2021
e66e49c
Attempt to fix CircleCI
estrada9166 Oct 26, 2021
88abc8d
Attempt to fix CircleCI
estrada9166 Oct 26, 2021
c9cf43e
Attempt to fix CircleCI
estrada9166 Oct 26, 2021
c2b8281
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-…
estrada9166 Oct 26, 2021
4d7a1c2
Attempt to fix CircleCI
estrada9166 Oct 26, 2021
d96e5ae
Merge branch 'alejandro/unified/use-config-file' of github.com:cypres…
estrada9166 Oct 26, 2021
f185449
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-…
estrada9166 Oct 26, 2021
289b56f
Attempt to fix CircleCI
estrada9166 Oct 26, 2021
5b27cff
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-…
estrada9166 Oct 26, 2021
7c25bed
Fix more tests
estrada9166 Oct 26, 2021
eed07a4
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-…
estrada9166 Oct 26, 2021
ed4593e
Attempt to fix test
estrada9166 Oct 26, 2021
2f183ba
Revert change
estrada9166 Oct 26, 2021
c790408
Handle cypress.json files
estrada9166 Oct 26, 2021
deaf156
Add e2e tests
estrada9166 Oct 27, 2021
85a6485
Merge branch 'unified-desktop-gui' of github.com:cypress-io/cypress i…
estrada9166 Oct 27, 2021
cf0476c
Remove write when config file do not exist
estrada9166 Oct 27, 2021
13a1382
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-…
estrada9166 Oct 27, 2021
07dc4d5
Fix tests
estrada9166 Oct 27, 2021
01891c1
Fix tests
estrada9166 Oct 27, 2021
803b172
Fix tests
estrada9166 Oct 27, 2021
e677247
Update test
estrada9166 Oct 28, 2021
bb479bc
Update tests
estrada9166 Oct 28, 2021
83aa113
Update tests
estrada9166 Oct 28, 2021
16d5ebc
Update snapshots
estrada9166 Oct 28, 2021
5e92e63
Merge branch 'unified-desktop-gui' of github.com:cypress-io/cypress i…
estrada9166 Oct 28, 2021
d2fb618
Cleanup code
estrada9166 Oct 28, 2021
c6d2fd4
Fix tests
estrada9166 Oct 28, 2021
602ff9f
Update CircleCi job, refactor cache, use defineConfig
estrada9166 Oct 28, 2021
3b38404
Attempt to fix Ci
estrada9166 Oct 28, 2021
82372e9
Attempt to fix Ci
estrada9166 Oct 28, 2021
3e19cc8
Attempt to fix Ci
estrada9166 Oct 28, 2021
59e6d2c
Attempt to fix Ci
estrada9166 Oct 28, 2021
001b109
Update tests, revert cache read
estrada9166 Oct 28, 2021
bd503ec
Fix circleCi file
estrada9166 Oct 28, 2021
d7322d1
Update circleCi file
estrada9166 Oct 29, 2021
3a0f9d2
Update circleCi file
estrada9166 Oct 29, 2021
f8e291b
Update circleCi file
estrada9166 Oct 29, 2021
785026e
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-…
estrada9166 Oct 29, 2021
e0bdfb5
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-…
estrada9166 Oct 29, 2021
108b7f8
Revert default config file for tests
estrada9166 Oct 29, 2021
7ec7622
Update error message
estrada9166 Oct 29, 2021
1a40e5a
Update wizard step
estrada9166 Oct 29, 2021
0702fbb
Do not save confi in file cache
estrada9166 Oct 29, 2021
3048ac6
Revert "Do not save confi in file cache"
tgriesser Oct 29, 2021
cee98b3
Pairing w/ alejandro
tgriesser Oct 29, 2021
a861f35
Fix tests
estrada9166 Oct 29, 2021
9c99ac1
Merge branch 'unified-desktop-gui' of github.com:cypress-io/cypress i…
estrada9166 Oct 30, 2021
345c840
Fix tests
estrada9166 Oct 30, 2021
4ae2b5d
Attempt to fix tests
estrada9166 Oct 30, 2021
2b0be87
Fix tests
estrada9166 Oct 30, 2021
edd41e3
Fix some tests
estrada9166 Oct 30, 2021
3ea0943
Merge branch 'unified-desktop-gui' of github.com:cypress-io/cypress i…
estrada9166 Nov 1, 2021
118402b
Fix build, fix tests
estrada9166 Nov 1, 2021
c3a2f54
Merge branch 'unified-desktop-gui' of github.com:cypress-io/cypress i…
estrada9166 Nov 1, 2021
3c83d81
Fix tests
estrada9166 Nov 1, 2021
82be2d6
Merge branch 'unified-desktop-gui' of github.com:cypress-io/cypress i…
estrada9166 Nov 1, 2021
287c706
scaffold cypress-example-kitchensink tests from branch feat/use-confi…
tgriesser Nov 1, 2021
2d6c338
Remove need for cleanupCreatedFilesInProject
tgriesser Nov 1, 2021
94e1e85
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-…
estrada9166 Nov 1, 2021
e3ead50
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-…
estrada9166 Nov 2, 2021
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
Prev Previous commit
Merge branch 'unified-desktop-gui' into alejandro/unified/use-config-… 
…file
@estrada9166
estrada9166 authored Nov 2, 2021
commit e3ead50f823ab6682590d88b058719c79b9ec83b

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.