Skip to content

Commit 15a957a

Browse files
chrisbreidingchrisbreiding
committed
Merge branch 'feature-multidomain' into issue-16452-multidomain-sibling-iframe
2 parents cdb41e3 + 8bc9b5d commit 15a957a

File tree

81 files changed

+1183
-9840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1183
-9840
lines changed

‎circle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1327,7 +1327,7 @@ jobs:
13271327
npm-vue:
13281328
<<: *defaults
13291329
resource_class: medium
1330-
parallelism: 4
1330+
parallelism: 3
13311331
steps:
13321332
- restore_cached_workspace
13331333
- run:

‎cli/__snapshots__/install_spec.js‎

Lines changed: 100 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
exports['continues installing on failure 1'] = `
22
Installing Cypress (version: 1.2.3)
33
4-
✔ Downloaded Cypress
5-
✔ Unzipped Cypress
6-
✔ Finished Installation /cache/Cypress/1.2.3
4+
5+
⠋ Downloaded Cypress
6+
✔ Downloaded Cypress
7+
✔ Downloaded Cypress
8+
⠋ Unzipped Cypress
9+
✔ Downloaded Cypress
10+
✔ Unzipped Cypress
11+
✔ Downloaded Cypress
12+
✔ Unzipped Cypress
13+
⠋ Finished Installation /cache/Cypress/1.2.3
14+
✔ Downloaded Cypress
15+
✔ Unzipped Cypress
16+
✔ Finished Installation /cache/Cypress/1.2.3
17+
✔ Downloaded Cypress
18+
✔ Unzipped Cypress
19+
✔ Finished Installation /cache/Cypress/1.2.3
720
821
You can now open Cypress by running: node_modules/.bin/cypress open
922
@@ -18,9 +31,22 @@ Cypress 1.2.3 is installed in /cache/Cypress/1.2.3
1831
1932
Installing Cypress (version: 1.2.3)
2033
21-
✔ Downloaded Cypress
22-
✔ Unzipped Cypress
23-
✔ Finished Installation /cache/Cypress/1.2.3
34+
35+
⠋ Downloaded Cypress
36+
✔ Downloaded Cypress
37+
✔ Downloaded Cypress
38+
⠋ Unzipped Cypress
39+
✔ Downloaded Cypress
40+
✔ Unzipped Cypress
41+
✔ Downloaded Cypress
42+
✔ Unzipped Cypress
43+
⠋ Finished Installation /cache/Cypress/1.2.3
44+
✔ Downloaded Cypress
45+
✔ Unzipped Cypress
46+
✔ Finished Installation /cache/Cypress/1.2.3
47+
✔ Downloaded Cypress
48+
✔ Unzipped Cypress
49+
✔ Finished Installation /cache/Cypress/1.2.3
2450
2551
You can now open Cypress by running: node_modules/.bin/cypress open
2652
@@ -35,9 +61,22 @@ Cypress x.x.x is installed in /cache/Cypress/1.2.3
3561
3662
Installing Cypress (version: 1.2.3)
3763
38-
✔ Downloaded Cypress
39-
✔ Unzipped Cypress
40-
✔ Finished Installation /cache/Cypress/1.2.3
64+
65+
⠋ Downloaded Cypress
66+
✔ Downloaded Cypress
67+
✔ Downloaded Cypress
68+
⠋ Unzipped Cypress
69+
✔ Downloaded Cypress
70+
✔ Unzipped Cypress
71+
✔ Downloaded Cypress
72+
✔ Unzipped Cypress
73+
⠋ Finished Installation /cache/Cypress/1.2.3
74+
✔ Downloaded Cypress
75+
✔ Unzipped Cypress
76+
✔ Finished Installation /cache/Cypress/1.2.3
77+
✔ Downloaded Cypress
78+
✔ Unzipped Cypress
79+
✔ Finished Installation /cache/Cypress/1.2.3
4180
4281
You can now open Cypress by running: node_modules/.bin/cypress open
4382
@@ -52,12 +91,8 @@ Cypress x.x.x is installed in /cache/Cypress/1.2.3
5291
5392
Installing Cypress (version: 1.2.3)
5493
55-
[xx:xx:xx] Downloading Cypress [started]
56-
[xx:xx:xx] Downloading Cypress [completed]
57-
[xx:xx:xx] Unzipping Cypress [started]
58-
[xx:xx:xx] Unzipping Cypress [completed]
59-
[xx:xx:xx] Finishing Installation [started]
60-
[xx:xx:xx] Finishing Installation [completed]
94+
95+
6196
6297
You can now open Cypress by running: node_modules/.bin/cypress open
6398
@@ -69,9 +104,22 @@ https://on.cypress.io/installing-cypress
69104
exports['installs without existing installation 1'] = `
70105
Installing Cypress (version: 1.2.3)
71106
72-
✔ Downloaded Cypress
73-
✔ Unzipped Cypress
74-
✔ Finished Installation /cache/Cypress/1.2.3
107+
108+
⠋ Downloaded Cypress
109+
✔ Downloaded Cypress
110+
✔ Downloaded Cypress
111+
⠋ Unzipped Cypress
112+
✔ Downloaded Cypress
113+
✔ Unzipped Cypress
114+
✔ Downloaded Cypress
115+
✔ Unzipped Cypress
116+
⠋ Finished Installation /cache/Cypress/1.2.3
117+
✔ Downloaded Cypress
118+
✔ Unzipped Cypress
119+
✔ Finished Installation /cache/Cypress/1.2.3
120+
✔ Downloaded Cypress
121+
✔ Unzipped Cypress
122+
✔ Finished Installation /cache/Cypress/1.2.3
75123
76124
You can now open Cypress by running: node_modules/.bin/cypress open
77125
@@ -101,6 +149,8 @@ Cypress Version: 1.2.3
101149

102150
exports['silent install 1'] = `
103151
[no output]
152+
153+
104154
`
105155

106156
exports['skip installation 1'] = `
@@ -120,9 +170,22 @@ exports['specify version in env vars 1'] = `
120170
121171
Installing Cypress (version: 0.12.1)
122172
123-
✔ Downloaded Cypress
124-
✔ Unzipped Cypress
125-
✔ Finished Installation /cache/Cypress/1.2.3
173+
174+
⠋ Downloaded Cypress
175+
✔ Downloaded Cypress
176+
✔ Downloaded Cypress
177+
⠋ Unzipped Cypress
178+
✔ Downloaded Cypress
179+
✔ Unzipped Cypress
180+
✔ Downloaded Cypress
181+
✔ Unzipped Cypress
182+
⠋ Finished Installation /cache/Cypress/1.2.3
183+
✔ Downloaded Cypress
184+
✔ Unzipped Cypress
185+
✔ Finished Installation /cache/Cypress/1.2.3
186+
✔ Downloaded Cypress
187+
✔ Unzipped Cypress
188+
✔ Finished Installation /cache/Cypress/1.2.3
126189
127190
You can now open Cypress by running: node_modules/.bin/cypress open
128191
@@ -154,9 +217,22 @@ Cypress x.x.x is installed in /cache/Cypress/1.2.3
154217
155218
Installing Cypress (version: 1.2.3)
156219
157-
✔ Downloaded Cypress
158-
✔ Unzipped Cypress
159-
✔ Finished Installation /cache/Cypress/1.2.3
220+
221+
⠋ Downloaded Cypress
222+
✔ Downloaded Cypress
223+
✔ Downloaded Cypress
224+
⠋ Unzipped Cypress
225+
✔ Downloaded Cypress
226+
✔ Unzipped Cypress
227+
✔ Downloaded Cypress
228+
✔ Unzipped Cypress
229+
⠋ Finished Installation /cache/Cypress/1.2.3
230+
✔ Downloaded Cypress
231+
✔ Unzipped Cypress
232+
✔ Finished Installation /cache/Cypress/1.2.3
233+
✔ Downloaded Cypress
234+
✔ Unzipped Cypress
235+
✔ Finished Installation /cache/Cypress/1.2.3
160236
161237
⚠ Warning: It looks like you've installed Cypress globally.
162238

‎cli/__snapshots__/verify_spec.js‎

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ Cypress Version: 1.2.3
2222
exports['current version has not been verified 1'] = `
2323
It looks like this is your first time using Cypress: 1.2.3
2424
25-
✔ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
25+
26+
⠋ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
27+
✔ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
28+
✔ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
2629
2730
Opening Cypress...
2831
@@ -59,7 +62,10 @@ Found binary version 7.8.9 installed in: /cache/Cypress/1.2.3/Cypress.app
5962
6063
It looks like this is your first time using Cypress: 7.8.9
6164
62-
✔ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
65+
66+
⠋ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
67+
✔ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
68+
✔ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
6369
6470
Opening Cypress...
6571
@@ -105,9 +111,9 @@ Cypress Version: 1.2.3
105111
`
106112

107113
exports['fails verifying Cypress 1'] = `
108-
109-
✖ Verifying Cypress can run /cache/Cypress/1.2.3/Cypress.app
110114
STRIPPED
115+
116+
111117
Error: Cypress failed to start.
112118
113119
This is usually caused by a missing library or dependency.
@@ -152,10 +158,10 @@ Cypress Version: 1.2.3
152158
`
153159

154160
exports['lib/tasks/verify logs error when child process hangs 1'] = `
155-
It looks like this is your first time using Cypress: 1.2.3
156-
157-
✖ Verifying Cypress can run /cache/Cypress/1.2.3/Cypress.app
158161
STRIPPED
162+
163+
164+
159165
Error: Cypress verification timed out.
160166
161167
This command failed with the following output:
@@ -174,10 +180,10 @@ Cypress Version: 1.2.3
174180
`
175181

176182
exports['lib/tasks/verify logs error when child process returns incorrect stdout (stderr when exists) 1'] = `
177-
It looks like this is your first time using Cypress: 1.2.3
178-
179-
✖ Verifying Cypress can run /cache/Cypress/1.2.3/Cypress.app
180183
STRIPPED
184+
185+
186+
181187
Error: Cypress verification failed.
182188
183189
This command failed with the following output:
@@ -196,10 +202,10 @@ Cypress Version: 1.2.3
196202
`
197203

198204
exports['lib/tasks/verify logs error when child process returns incorrect stdout (stdout when no stderr) 1'] = `
199-
It looks like this is your first time using Cypress: 1.2.3
200-
201-
✖ Verifying Cypress can run /cache/Cypress/1.2.3/Cypress.app
202205
STRIPPED
206+
207+
208+
203209
Error: Cypress verification failed.
204210
205211
This command failed with the following output:
@@ -283,6 +289,8 @@ Found binary version 7.8.9 installed in: /cache/Cypress/1.2.3/Cypress.app
283289

284290
exports['silent verify 1'] = `
285291
[no output]
292+
293+
286294
`
287295

288296
exports['valid CYPRESS_RUN_BINARY 1'] = `
@@ -294,7 +302,10 @@ This overrides the default Cypress binary path used.
294302
295303
It looks like this is your first time using Cypress: 1.2.3
296304
297-
✔ Verified Cypress! /real/custom
305+
306+
⠋ Verified Cypress! /real/custom
307+
✔ Verified Cypress! /real/custom
308+
✔ Verified Cypress! /real/custom
298309
299310
Opening Cypress...
300311
@@ -303,15 +314,21 @@ Opening Cypress...
303314
exports['verbose stdout output 1'] = `
304315
It looks like this is your first time using Cypress: 1.2.3
305316
306-
✔ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
317+
318+
⠋ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
319+
✔ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
320+
✔ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
307321
308322
Opening Cypress...
309323
310324
`
311325

312326
exports['verification with executable 1'] = `
313327
314-
✔ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
328+
329+
⠋ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
330+
✔ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
331+
✔ Verified Cypress! /cache/Cypress/1.2.3/Cypress.app
315332
316333
Opening Cypress...
317334
@@ -320,8 +337,8 @@ Opening Cypress...
320337
exports['verifying in ci 1'] = `
321338
It looks like this is your first time using Cypress: 1.2.3
322339
323-
[xx:xx:xx] Verifying Cypress can run /cache/Cypress/1.2.3/Cypress.app [started]
324-
[xx:xx:xx] Verifying Cypress can run /cache/Cypress/1.2.3/Cypress.app [completed]
340+
341+
325342
326343
Opening Cypress...
327344
@@ -360,10 +377,10 @@ Cypress Version: 1.2.3
360377
`
361378

362379
exports['xvfb fails 1'] = `
363-
It looks like this is your first time using Cypress: 1.2.3
364-
365-
✖ Verifying Cypress can run /cache/Cypress/1.2.3/Cypress.app
366380
STRIPPED
381+
382+
383+
367384
Error: Xvfb exited with a non zero exit code.
368385
369386
There was a problem spawning Xvfb.

‎cli/lib/tasks/install.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const url = require('url')
44
const path = require('path')
55
const chalk = require('chalk')
66
const debug = require('debug')('cypress:cli')
7-
const Listr = require('listr')
7+
const { Listr } = require('listr2')
88
const verbose = require('@cypress/listr-verbose-renderer')
99
const Promise = require('bluebird')
1010
const logSymbols = require('log-symbols')
@@ -162,7 +162,7 @@ const downloadAndUnzip = ({ version, installDir, downloadDir }) => {
162162

163163
const tasks = new Listr([
164164
{
165-
title: util.titleize('Downloading Cypress'),
165+
options: { title: util.titleize('Downloading Cypress') },
166166
task: (ctx, task) => {
167167
// as our download progresses indicate the status
168168
progress.onProgress = progessify(task, 'Downloading Cypress')
@@ -190,7 +190,7 @@ const downloadAndUnzip = ({ version, installDir, downloadDir }) => {
190190
rendererOptions,
191191
}),
192192
{
193-
title: util.titleize('Finishing Installation'),
193+
options: { title: util.titleize('Finishing Installation') },
194194
task: (ctx, task) => {
195195
const cleanup = () => {
196196
debug('removing zip file %s', downloadDestination)
@@ -210,7 +210,7 @@ const downloadAndUnzip = ({ version, installDir, downloadDir }) => {
210210
})
211211
},
212212
},
213-
], rendererOptions)
213+
], { rendererOptions })
214214

215215
// start the tasks!
216216
return Promise.resolve(tasks.run())
@@ -390,7 +390,7 @@ const start = (options = {}) => {
390390
zipFilePath: absolutePath,
391391
installDir,
392392
rendererOptions,
393-
})], rendererOptions).run()
393+
})], { rendererOptions }).run()
394394
}
395395

396396
if (options.force) {
@@ -420,7 +420,7 @@ module.exports = {
420420

421421
const unzipTask = ({ zipFilePath, installDir, progress, rendererOptions }) => {
422422
return {
423-
title: util.titleize('Unzipping Cypress'),
423+
options: { title: util.titleize('Unzipping Cypress') },
424424
task: (ctx, task) => {
425425
// as our unzip progresses indicate the status
426426
progress.onProgress = progessify(task, 'Unzipping Cypress')

0 commit comments

Comments
 (0)