Skip to content

Commit 24d3d4c

Browse files
twometresteveSteve Kirkland
twometresteve
and
Steve Kirkland
authored
Rename fixtures files (final batch, 5) (#2624)
* Rename csp fixture * Rename delivery fixture * Rename device fixture files * Rename "a" fixture files * Rename "b" fixture files * Rename "c" fixture files * Rename remaining fixture files * Rename fixture files * Rename fixture files * Rename fixture files * Corrections * Corrections * Rename fixture files * Correction * Correction file name * Rename fixture files * Remove obsolete docker compose file versions * Rename test fixture files * Rename fixture files * Corrections * Renae fixture files * Move BitBar browser tests to EU hub * Fail fast and pipeline consistency --------- Co-authored-by: Steve Kirkland <steve.kirkland@smartbear.com>
1 parent 71d0eb6 commit 24d3d4c

31 files changed

Lines changed: 78 additions & 80 deletions

‎.buildkite/basic/browser-pipeline.yml‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ steps:
1111
timeout_in_minutes: 20
1212
plugins:
1313
- artifacts#v1.5.0:
14-
download: min_packages.tar
14+
download: "min_packages.tar"
1515
- docker-compose#v4.12.0:
1616
build:
17-
- browser-maze-runner-bb
18-
image-repository: 855461928731.dkr.ecr.us-west-1.amazonaws.com/js
17+
- "browser-maze-runner-bb"
18+
image-repository: "855461928731.dkr.ecr.us-west-1.amazonaws.com/js"
1919
cache-from:
20-
- browser-maze-runner-bb:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-browser-${BRANCH_NAME}
20+
- "browser-maze-runner-bb:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-browser-${BRANCH_NAME}"
2121
push:
22-
- browser-maze-runner-bb:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-browser-${BRANCH_NAME}
22+
- "browser-maze-runner-bb:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-browser-${BRANCH_NAME}"
2323
retry:
2424
automatic:
2525
- exit_status: "*"
@@ -31,15 +31,15 @@ steps:
3131
timeout_in_minutes: 20
3232
plugins:
3333
- artifacts#v1.5.0:
34-
download: min_packages.tar
34+
download: "min_packages.tar"
3535
- docker-compose#v4.12.0:
3636
build:
37-
- browser-maze-runner-bs
38-
image-repository: 855461928731.dkr.ecr.us-west-1.amazonaws.com/js
37+
- "browser-maze-runner-bs"
38+
image-repository: "855461928731.dkr.ecr.us-west-1.amazonaws.com/js"
3939
cache-from:
40-
- browser-maze-runner-bs:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-browser-${BRANCH_NAME}
40+
- "browser-maze-runner-bs:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-browser-${BRANCH_NAME}"
4141
push:
42-
- browser-maze-runner-bs:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-browser-${BRANCH_NAME}
42+
- "browser-maze-runner-bs:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-browser-${BRANCH_NAME}"
4343
retry:
4444
automatic:
4545
- exit_status: "*"
@@ -50,15 +50,16 @@ steps:
5050
#
5151
- label: ":browserstack: {{matrix}} non-https tests"
5252
matrix:
53-
- safari_16
53+
- "safari_16"
5454
depends_on: "browser-maze-runner-bs"
5555
timeout_in_minutes: 30
5656
plugins:
5757
docker-compose#v4.12.0:
58-
pull: browser-maze-runner-bs
59-
run: browser-maze-runner-bs
58+
pull: "browser-maze-runner-bs"
59+
run: "browser-maze-runner-bs"
6060
use-aliases: true
6161
command:
62+
- "--fail-fast"
6263
- "--farm=bs"
6364
- "--browser={{matrix}}"
6465
artifacts#v1.5.0:
@@ -71,28 +72,29 @@ steps:
7172
api-token-env-name: "BROWSER_BUILDKITE_ANALYTICS_TOKEN"
7273
concurrency: 2
7374
concurrency_group: "browserstack"
74-
concurrency_method: eager
75+
concurrency_method: "eager"
7576

7677
#
7778
# BrowserStack https tests
7879
#
7980
- label: ":browserstack: {{matrix}} tests"
8081
matrix:
81-
- edge_17
82-
- safari_10
83-
- ios_15
84-
- android_9
85-
- chrome_43
86-
- chrome_72
87-
- firefox_78
82+
- "edge_17"
83+
- "safari_10"
84+
- "ios_15"
85+
- "android_9"
86+
- "chrome_43"
87+
- "chrome_72"
88+
- "firefox_78"
8889
depends_on: "browser-maze-runner-bs"
8990
timeout_in_minutes: 30
9091
plugins:
9192
docker-compose#v4.12.0:
92-
pull: browser-maze-runner-bs
93-
run: browser-maze-runner-bs
93+
pull: "browser-maze-runner-bs"
94+
run: "browser-maze-runner-bs"
9495
use-aliases: true
9596
command:
97+
- "--fail-fast"
9698
- "--https"
9799
- "--farm=bs"
98100
- "--browser={{matrix}}"
@@ -106,25 +108,26 @@ steps:
106108
api-token-env-name: "BROWSER_BUILDKITE_ANALYTICS_TOKEN"
107109
concurrency: 2
108110
concurrency_group: "browserstack"
109-
concurrency_method: eager
111+
concurrency_method: "eager"
110112

111113
#
112114
# BitBar tests
113115
#
114116
- label: ":bitbar: {{matrix}} Browser tests (EU hub)"
115117
matrix:
116-
- firefox_latest
117-
- chrome_latest
118-
- edge_latest
118+
- "firefox_latest"
119+
- "chrome_latest"
120+
- "edge_latest"
119121
depends_on: "browser-maze-runner-bb"
120122
timeout_in_minutes: 30
121123
plugins:
122124
docker-compose#v4.12.0:
123-
pull: browser-maze-runner-bb
124-
run: browser-maze-runner-bb
125+
pull: "browser-maze-runner-bb"
126+
run: "browser-maze-runner-bb"
125127
service-ports: true
126128
use-aliases: true
127129
command:
130+
- "--fail-fast"
128131
- "--https"
129132
- "--farm=bb"
130133
- "--browser={{matrix}}"
@@ -140,18 +143,19 @@ steps:
140143
api-token-env-name: "BROWSER_BUILDKITE_ANALYTICS_TOKEN"
141144
concurrency: 25
142145
concurrency_group: "bitbar"
143-
concurrency_method: eager
146+
concurrency_method: "eager"
144147

145148
- label: ":bitbar: ie_11 Browser tests (EU hub)"
146149
depends_on: "browser-maze-runner-bb"
147150
timeout_in_minutes: 30
148151
plugins:
149152
docker-compose#v4.12.0:
150-
pull: browser-maze-runner-bb
151-
run: browser-maze-runner-bb
153+
pull: "browser-maze-runner-bb"
154+
run: "browser-maze-runner-bb"
152155
service-ports: true
153156
use-aliases: true
154157
command:
158+
- "--fail-fast"
155159
- "--farm=bb"
156160
- "--browser=ie_11"
157161
- "--no-tunnel"
@@ -166,6 +170,6 @@ steps:
166170
api-token-env-name: "BROWSER_BUILDKITE_ANALYTICS_TOKEN"
167171
concurrency: 25
168172
concurrency_group: "bitbar"
169-
concurrency_method: eager
173+
concurrency_method: "eager"
170174
env:
171175
HOST: "localhost" # IE11 needs the host set to localhost

‎docker-compose.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.6'
2-
31
x-common-environment: &common-environment
42
BUILDKITE:
53
BUILDKITE_BRANCH:

‎test/browser/features/fixtures/browser_errors.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ie_11:
88
errorMessage: "Expected ';'"
99
lineNumber: 18
1010
columnNumber: 13
11-
file: '/unhandled/script/a.html'
11+
file: '/unhandled/script/syntax_error.html'
1212
unhandled_thrown:
1313
errorClass: 'Error'
1414
errorMessage: "bad things"
@@ -34,7 +34,7 @@ edge_17:
3434
errorMessage: "Expected ';'"
3535
lineNumber: 18
3636
columnNumber: 13
37-
file: '/unhandled/script/a.html'
37+
file: '/unhandled/script/syntax_error.html'
3838
unhandled_thrown:
3939
errorClass: 'Error'
4040
errorMessage: "bad things"
@@ -60,7 +60,7 @@ safari_10:
6060
errorMessage: "Unexpected token '!'. Parse error."
6161
lineNumber: 18
6262
columnNumber: 0
63-
file: '/unhandled/script/a.html'
63+
file: '/unhandled/script/syntax_error.html'
6464
unhandled_thrown:
6565
errorClass: 'Error'
6666
errorMessage: "bad things"
@@ -86,7 +86,7 @@ safari_16:
8686
errorMessage: "Unexpected token '!'. Parse error."
8787
lineNumber: 18
8888
columnNumber: 0
89-
file: '/unhandled/script/a.html'
89+
file: '/unhandled/script/syntax_error.html'
9090
unhandled_thrown:
9191
errorClass: 'Error'
9292
errorMessage: "bad things"
@@ -112,7 +112,7 @@ ios_11:
112112
errorMessage: "Unexpected token '!'. Parse error."
113113
lineNumber: 18
114114
columnNumber: 0
115-
file: '/unhandled/script/a.html'
115+
file: '/unhandled/script/syntax_error.html'
116116
unhandled_thrown:
117117
errorClass: 'Error'
118118
errorMessage: "bad things"
@@ -138,7 +138,7 @@ ios_15:
138138
errorMessage: "Unexpected token '!'. Parse error."
139139
lineNumber: 18
140140
columnNumber: 0
141-
file: '/unhandled/script/a.html'
141+
file: '/unhandled/script/syntax_error.html'
142142
unhandled_thrown:
143143
errorClass: 'Error'
144144
errorMessage: "bad things"
@@ -164,7 +164,7 @@ android_4:
164164
errorMessage: "Unexpected token '!'"
165165
lineNumber: 18
166166
columnNumber: 13
167-
file: '/unhandled/script/a.html'
167+
file: '/unhandled/script/syntax_error.html'
168168
unhandled_thrown:
169169
errorClass: 'Error'
170170
errorMessage: "bad things"
@@ -190,7 +190,7 @@ android_6:
190190
errorMessage: "Unexpected token '!'"
191191
lineNumber: 18
192192
columnNumber: 13
193-
file: '/unhandled/script/a.html'
193+
file: '/unhandled/script/syntax_error.html'
194194
unhandled_thrown:
195195
errorClass: 'Error'
196196
errorMessage: "bad things"
@@ -216,7 +216,7 @@ android_7:
216216
errorMessage: "Unexpected token '!'"
217217
lineNumber: 18
218218
columnNumber: 13
219-
file: '/unhandled/script/a.html'
219+
file: '/unhandled/script/syntax_error.html'
220220
unhandled_thrown:
221221
errorClass: 'Error'
222222
errorMessage: "bad things"
@@ -242,7 +242,7 @@ android_8:
242242
errorMessage: "Unexpected token '!'"
243243
lineNumber: 18
244244
columnNumber: 13
245-
file: '/unhandled/script/a.html'
245+
file: '/unhandled/script/syntax_error.html'
246246
unhandled_thrown:
247247
errorClass: 'Error'
248248
errorMessage: "bad things"
@@ -268,7 +268,7 @@ android_9:
268268
errorMessage: "Unexpected token '!'"
269269
lineNumber: 18
270270
columnNumber: 13
271-
file: '/unhandled/script/a.html'
271+
file: '/unhandled/script/syntax_error.html'
272272
unhandled_thrown:
273273
errorClass: 'Error'
274274
errorMessage: "bad things"
@@ -294,7 +294,7 @@ firefox_78:
294294
errorMessage: "unexpected token: '!'"
295295
lineNumber: 18
296296
columnNumber: 12
297-
file: '/unhandled/script/a.html'
297+
file: '/unhandled/script/syntax_error.html'
298298
unhandled_thrown:
299299
errorClass: 'Error'
300300
errorMessage: "bad things"
@@ -320,7 +320,7 @@ chrome_43:
320320
errorMessage: "Unexpected token !"
321321
lineNumber: 18
322322
columnNumber: 13
323-
file: '/unhandled/script/a.html'
323+
file: '/unhandled/script/syntax_error.html'
324324
unhandled_thrown:
325325
errorClass: 'Error'
326326
errorMessage: "bad things"
@@ -346,7 +346,7 @@ chrome_72:
346346
errorMessage: "Unexpected token !"
347347
lineNumber: 18
348348
columnNumber: 13
349-
file: '/unhandled/script/a.html'
349+
file: '/unhandled/script/syntax_error.html'
350350
unhandled_thrown:
351351
errorClass: 'Error'
352352
errorMessage: "bad things"
@@ -374,7 +374,7 @@ chrome_latest:
374374
errorMessage: "Unexpected token '!'"
375375
lineNumber: 18
376376
columnNumber: 13
377-
file: '/unhandled/script/a.html'
377+
file: '/unhandled/script/syntax_error.html'
378378
unhandled_thrown:
379379
errorClass: 'Error'
380380
errorMessage: "bad things"
@@ -400,7 +400,7 @@ edge_latest:
400400
errorMessage: "Unexpected token '!'"
401401
lineNumber: 18
402402
columnNumber: 13
403-
file: '/unhandled/script/a.html'
403+
file: '/unhandled/script/syntax_error.html'
404404
unhandled_thrown:
405405
errorClass: 'Error'
406406
errorMessage: "bad things"
@@ -426,7 +426,7 @@ firefox_latest:
426426
errorMessage: "unexpected token: '!'"
427427
lineNumber: 18
428428
columnNumber: 13
429-
file: '/unhandled/script/a.html'
429+
file: '/unhandled/script/syntax_error.html'
430430
unhandled_thrown:
431431
errorClass: 'Error'
432432
errorMessage: "bad things"

test/browser/features/fixtures/release_stage/script/f.html renamed to test/browser/features/fixtures/release_stage/script/empty_enabled_stages.html

File renamed without changes.

test/browser/features/fixtures/release_stage/script/e.html renamed to test/browser/features/fixtures/release_stage/script/null_enabled_stages.html

File renamed without changes.

test/browser/features/fixtures/release_stage/script/b.html renamed to test/browser/features/fixtures/release_stage/script/release_stage_development.html

File renamed without changes.

test/browser/features/fixtures/release_stage/script/d.html renamed to test/browser/features/fixtures/release_stage/script/release_stage_enabled.html

File renamed without changes.

test/browser/features/fixtures/release_stage/script/c.html renamed to test/browser/features/fixtures/release_stage/script/release_stage_not_enabled.html

File renamed without changes.

test/browser/features/fixtures/release_stage/script/a.html renamed to test/browser/features/fixtures/release_stage/script/release_stage_production.html

File renamed without changes.

test/browser/features/fixtures/sessions/script/a.html renamed to test/browser/features/fixtures/sessions/script/default.html

File renamed without changes.

0 commit comments

Comments
 (0)