Skip to content

Commit 50b613f

Browse files
authored
SauceLabs build ID (#23)
Explicitly set sauceLabs.build with TRAVIS_BUILD_NUMBER if needed
1 parent e556c47 commit 50b613f

File tree

4 files changed

+40
-16
lines changed

4 files changed

+40
-16
lines changed

.travis.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,24 @@
22
language: node_js
33
node_js:
44
- "lts/*"
5+
addons:
6+
firefox: latest
57
env:
68
- BROWSER=slChrome
79
- BROWSER=slFirefox
8-
# - BROWSER=slSafari
9-
# - BROWSER=slIE
10+
- BROWSER=slSafari
11+
- BROWSER=slIE
12+
- BROWSER=slEdge
13+
- BROWSER=FirefoxHeadless
1014
- BROWSER=
1115
matrix:
12-
allow_failures:
13-
- env: BROWSERS=slIE
16+
fast_finish: true
17+
allow_failures:
18+
- env: BROWSER=slChrome
19+
- env: BROWSER=slFirefox
20+
- env: BROWSER=slSafari
21+
- env: BROWSER=slIE
22+
- env: BROWSER=slEdge
1423
cache: npm
1524
install: |
1625
if [ "${BROWSER}" = "" ]
@@ -21,7 +30,7 @@ script: |
2130
if [ "${BROWSER}" = "" ]
2231
then npm run test:cover
2332
else
24-
npm run test:browser:saucelabs -- --browsers "$BROWSER"
33+
travis_wait 300 npm run test:browser -- --browsers "$BROWSER"
2534
fi
2635
after_success: |
2736
if [ "${BROWSER}" = "" ]

karma.conf.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { sauceLabs, sauceLaunchers, SauceLauncher } from "./sauceLabs";
1+
import { sauceLabs, sauceLaunchers } from "./sauceLabs";
22

33
const webpackConfig = require("./webpack.config.js");
44

@@ -8,6 +8,7 @@ export default function configure(config: any) {
88
...sauceLaunchers,
99
},
1010
sauceLabs,
11+
browsers: ["ChromeHeadless", "FirefoxHeadless"],
1112

1213
basePath: "",
1314
frameworks: ["mocha"],

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
"clean": "rm -rf build dist dist.*",
1313
"test": "mocha 'test/**/*.test.ts'",
1414
"test:cover": "npx nyc mocha 'test/**/*.test.ts'",
15-
"test:browser": "karma start --single-run --browsers FirefoxHeadless,ChromeHeadless",
15+
"test:browser": "karma start --single-run",
1616
"test:browser:firefox": "karma start --single-run --browsers FirefoxHeadless",
1717
"test:browser:chrome": "karma start --single-run --browsers ChromeHeadless",
18-
"test:browser:saucelabs": "karma start --single-run",
1918
"test:watch:browser": "karma start --browsers ChromeHeadless,FirefoxHeadless",
2019
"test:watch:nodejs": "mocha -w 'test/**/*.test.ts'",
2120
"lint": "eslint --ext .ts src test",

sauceLabs.ts

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,27 @@
11
// https://saucelabs.com/platforms
22

3+
const IS_LOCAL = !!process.env.TRAVIS_BUILD_NUMBER;
4+
35
export type SauceLauncher = {
46
base: "SauceLabs";
57
browserName: string;
68

79
platform?: string;
810
version?: string;
9-
deviceName?: string;
1011
};
1112

1213
export const sauceLabs = {
1314
testName: "@msgpack/msgpack unit tests",
1415
tags: ["msgpack-javascript"],
15-
recordVideo: true,
16-
recordScreenshots: true,
17-
maxDuration: 120,
16+
recordVideo: IS_LOCAL,
17+
recordScreenshots: IS_LOCAL,
18+
browserDisconnectTolerance: 5,
19+
20+
// Only master branch are logged to the SauceLabs builds, which updates the browser-matrix badge.
21+
build:
22+
process.env.TRAVIS_BRANCH === "master" && process.env.TRAVIS_EVENT_TYPE !== "pull_request"
23+
? process.env.TRAVIS_BUILD_NUMBER
24+
: undefined,
1825
};
1926

2027
export const sauceLaunchers: Record<string, SauceLauncher> = {
@@ -26,19 +33,27 @@ export const sauceLaunchers: Record<string, SauceLauncher> = {
2633
},
2734
slFirefox: {
2835
base: "SauceLabs",
29-
browserName: "firefox",
36+
browserName: "Firefox",
3037
version: "latest",
3138
platform: "Windows 10",
3239
},
3340
slSafari: {
3441
base: "SauceLabs",
35-
browserName: "safari",
42+
browserName: "Safari",
3643
version: "latest",
44+
// "macOS 10.14" is unstable for now
45+
platform: "macOS 10.13",
3746
},
38-
slIE: {
47+
slEdge: {
3948
base: "SauceLabs",
40-
browserName: "internet explorer",
49+
browserName: "MicrosoftEdge",
50+
version: "latest",
4151
platform: "Windows 10",
52+
},
53+
slIE: {
54+
base: "SauceLabs",
55+
browserName: "Internet Explorer",
4256
version: "latest",
57+
platform: "Windows 10",
4358
},
4459
};

0 commit comments

Comments
 (0)