You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Merge branch 'unified-desktop-gui' into tgriesser/unify/rename-and-move-activeProject
* unified-desktop-gui: (57 commits)
chore: Add e2e tests for global mode (#18719)
chore: add percy to app and launchpad package (#18781)
chore: update test
refactor: move settings in app (#18729)
feat: setup launchpad lifecycle (#18734)
feat(app): decouple event manager from driver (#18695)
chore: Force single resolution for core modules, infinite loop guard (#18764)
fix(driver): Sticky elements within a fixed container will not prevent an element from being scrolled to (#18441)
chore: cleaning up the runner container pattern (#18741)
feat: Use .config files (#18578)
chore(app): basic style and example to stop scrollIntoView bug (#18736)
chore: make `create` function on server.ts obsolete (#18615)
feat: add codegen utility (#18708)
docs: Add instructions to squash commits to develop in Contributing (#18728)
fix(@cypress/react): throw if using Next.js swc-loader without nodeVersion=system (#18686)
refactor: remove Ramda (#18723)
fix: support using create-cypress-tests as part of build process (#18714)
chore: Increase paralleled machines for desktop-gui tests (#18725)
fix(app): do not cache graphql (#18716)
chore: Update Chrome (stable) to 95.0.4638.69 (#18696)
...
Copy file name to clipboardexpand all lines: CONTRIBUTING.md
+2
Original file line number
Diff line number
Diff line change
@@ -573,6 +573,8 @@ Independent packages are automatically released when code is merged into `master
573
573
574
574
- Please check the "Allow edits from maintainers" checkbox when submitting your PR. This will make it easier for the maintainers to make minor adjustments, to help with tests or any other changes we may need.
575
575
576
+
- After the PR is approved, the original contributor can merge the PR (if the original contributor has access).
577
+
- When you merge a PR into `develop`, select[**Squash and merge**](https://docs.github.com/en/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-pull-request-commits). This will squash all commits into a single commit. *The only exception to squashing is when converting files to another language and there is a clear commit history needed to maintain from the file conversion.*
Copy file name to clipboardexpand all lines: cli/__snapshots__/cli_spec.js
+11-9
Original file line number
Diff line number
Diff line change
@@ -21,19 +21,21 @@ exports['shows help for open --foo 1'] = `
21
21
--component runs component tests
22
22
-c, --config <config> sets configuration values. separate multiple
23
23
values with a comma. overrides any value in
24
-
cypress.json.
24
+
cypress.config.{ts|js}.
25
25
-C, --config-file <config-file> path to JSON file where configuration values
26
-
are set. defaults to "cypress.json". pass
27
-
"false" to disable.
26
+
are set. defaults to
27
+
"cypress.config.{ts|js}". pass "false" to
28
+
disable.
28
29
-d, --detached [bool] runs Cypress application in detached mode
29
30
--e2e runs end to end tests
30
31
-e, --env <env> sets environment variables. separate
31
32
multiple values with a comma. overrides any
32
-
value in cypress.json or cypress.env.json
33
+
value in cypress.config.{ts|js} or
34
+
cypress.env.json
33
35
--global force Cypress into global mode as if its
34
36
globally installed
35
37
-p, --port <port> runs Cypress on a specific port. overrides
36
-
any value in cypress.json.
38
+
any value in cypress.config.{ts|js}.
37
39
-P, --project <project-path> path to the project
38
40
--dev runs cypress in development and bypasses
39
41
binary check
@@ -67,17 +69,17 @@ exports['shows help for run --foo 1'] = `
67
69
-b, --browser <browser-name-or-path> runs Cypress in the browser with the given name. if a filesystem path is supplied, Cypress will attempt to use the browser at that path.
68
70
--ci-build-id <id> the unique identifier for a run on your CI provider. typically a "BUILD_ID" env var. this value is automatically detected for most CI providers
69
71
--component runs component tests
70
-
-c, --config <config> sets configuration values. separate multiple values with a comma. overrides any value in cypress.json.
71
-
-C, --config-file <config-file> path to JSON file where configuration values are set. defaults to "cypress.json". pass "false" to disable.
72
+
-c, --config <config> sets configuration values. separate multiple values with a comma. overrides any value in cypress.config.{ts|js}.
73
+
-C, --config-file <config-file> path to JSON file where configuration values are set. defaults to "cypress.config.{ts|js}". pass "false" to disable.
72
74
--e2e runs end to end tests
73
-
-e, --env <env> sets environment variables. separate multiple values with a comma. overrides any value in cypress.json or cypress.env.json
75
+
-e, --env <env> sets environment variables. separate multiple values with a comma. overrides any value in cypress.config.{ts|js} or cypress.env.json
74
76
--group <name> a named group for recorded runs in the Cypress Dashboard
75
77
-k, --key <record-key> your secret Record Key. you can omit this if you set a CYPRESS_RECORD_KEY environment variable.
76
78
--headed displays the browser instead of running headlessly
77
79
--headless hide the browser instead of running headed (default for cypress run)
78
80
--no-exit keep the browser open after tests finish
79
81
--parallel enables concurrent runs and automatic load balancing of specs across multiple machines or processes
80
-
-p, --port <port> runs Cypress on a specific port. overrides any value in cypress.json.
82
+
-p, --port <port> runs Cypress on a specific port. overrides any value in cypress.config.{ts|js}.
81
83
-P, --project <project-path> path to the project
82
84
-q, --quiet run quietly, using only the configured reporter
83
85
--record [bool] records the run. sends test results, screenshots and videos to your Cypress Dashboard.
Copy file name to clipboardexpand all lines: cli/lib/cli.js
+14-10
Original file line number
Diff line number
Diff line change
@@ -1,6 +1,5 @@
1
1
// @ts-check
2
2
const_=require('lodash')
3
-
constR=require('ramda')
4
3
constcommander=require('commander')
5
4
const{ stripIndent }=require('common-tags')
6
5
constlogSymbols=require('log-symbols')
@@ -107,12 +106,12 @@ const descriptions = {
107
106
cacheSize: 'Used with the list command to show the sizes of the cached folders',
108
107
ciBuildId: 'the unique identifier for a run on your CI provider. typically a "BUILD_ID" env var. this value is automatically detected for most CI providers',
109
108
component: 'runs component tests',
110
-
config: 'sets configuration values. separate multiple values with a comma. overrides any value in cypress.json.',
111
-
configFile: 'path to JSON file where configuration values are set. defaults to "cypress.json". pass "false" to disable.',
109
+
config: 'sets configuration values. separate multiple values with a comma. overrides any value in cypress.config.{ts|js}.',
110
+
configFile: 'path to JSON file where configuration values are set. defaults to "cypress.config.{ts|js}". pass "false" to disable.',
112
111
detached: 'runs Cypress application in detached mode',
113
112
dev: 'runs cypress in development and bypasses binary check',
114
113
e2e: 'runs end to end tests',
115
-
env: 'sets environment variables. separate multiple values with a comma. overrides any value in cypress.json or cypress.env.json',
114
+
env: 'sets environment variables. separate multiple values with a comma. overrides any value in cypress.config.{ts|js} or cypress.env.json',
116
115
exit: 'keep the browser open after tests finish',
117
116
forceInstall: 'force install the Cypress binary',
118
117
global: 'force Cypress into global mode as if its globally installed',
@@ -121,7 +120,7 @@ const descriptions = {
121
120
headless: 'hide the browser instead of running headed (default for cypress run)',
122
121
key: 'your secret Record Key. you can omit this if you set a CYPRESS_RECORD_KEY environment variable.',
123
122
parallel: 'enables concurrent runs and automatic load balancing of specs across multiple machines or processes',
124
-
port: 'runs Cypress on a specific port. overrides any value in cypress.json.',
123
+
port: 'runs Cypress on a specific port. overrides any value in cypress.config.{ts|js}.',
125
124
project: 'path to the project',
126
125
quiet: 'run quietly, using only the configured reporter',
127
126
record: 'records the run. sends test results, screenshots and videos to your Cypress Dashboard.',
0 commit comments