Skip to content

Commit ebe3532

Browse files
author
Sassoun Derderian
committed
chore: travis.yaml set CI env variable
1 parent a156cb4 commit ebe3532

3 files changed

Lines changed: 69 additions & 64 deletions

File tree

.travis.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,17 @@ notifications:
55
on_failure: always
66
on_success: change
77
node_js:
8-
- '6'
9-
- '4'
8+
- '6'
9+
- '4'
10+
env:
11+
- CI=BS
12+
- CI=TRAVIS
1013
script: npm run ci-test
1114
env:
1215
global:
13-
- secure: PGLnN1ksLylD9BpxnKQymWfi6GpcGUuqkOlEJqA6yJp4oq7itvlPENtDYylVqmD3LM7tgFUk8PJHFsKDBY1d2dK6uqleKVMI0u49vZcAf4uIqDTJh1CEGhEMCZY7tgdLiGyjwSMzh/GqkJWia9hOCWSnpCmZi3gL/aaI46bm1aY=
14-
- secure: E3GeYXyCZO/inAMVX+JZMtiJ2ocSTOkIsuML0tTWbHtd8abtX4hOkXqIlSE5WOqO1LnYX43Qs96iysg+D6S+JUlbESsU2+otl0PBV+cE8KMh23c8bUXCZ6NKAKGXXFTWc1UkeAqv8jeq+TSp2WtyBANXJWhaFNYnGOAN1jcvcUc=
16+
- secure: PGLnN1ksLylD9BpxnKQymWfi6GpcGUuqkOlEJqA6yJp4oq7itvlPENtDYylVqmD3LM7tgFUk8PJHFsKDBY1d2dK6uqleKVMI0u49vZcAf4uIqDTJh1CEGhEMCZY7tgdLiGyjwSMzh/GqkJWia9hOCWSnpCmZi3gL/aaI46bm1aY=
17+
- secure: E3GeYXyCZO/inAMVX+JZMtiJ2ocSTOkIsuML0tTWbHtd8abtX4hOkXqIlSE5WOqO1LnYX43Qs96iysg+D6S+JUlbESsU2+otl0PBV+cE8KMh23c8bUXCZ6NKAKGXXFTWc1UkeAqv8jeq+TSp2WtyBANXJWhaFNYnGOAN1jcvcUc=
18+
matrix:
19+
exclude:
20+
- node: '4'
21+
env: CI=BS

karma-ci.conf.js

Lines changed: 56 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,64 @@
22

33
const karmaConfig = require('./karma.conf');
44

5-
module.exports = function (config) {
6-
karmaConfig(config)
5+
const CI = process.env.CI
76

8-
// Browsers to run on Sauce Labs
9-
const customLaunchers = {
10-
'bs_chrome_mac': {
11-
base: 'BrowserStack',
12-
browser: 'chrome',
13-
browser_version: '56.0',
14-
os: 'OS X',
15-
os_version: 'Sierra'
16-
},
17-
'bs_firefox_mac': {
18-
base: 'BrowserStack',
19-
browser: 'firefox',
20-
browser_version: '52.0',
21-
os: 'OS X',
22-
os_version: 'Sierra'
23-
},
24-
'bs_internet_explorer_win': {
25-
base: 'BrowserStack',
26-
browser: 'internet explorer',
27-
browser_version: '11.0',
28-
os: 'Windows',
29-
os_version: '7'
30-
},
31-
'bs_safari_mac': {
32-
base: 'BrowserStack',
33-
browser: 'safari',
34-
browser_version: '10.0',
35-
os: 'OS X',
36-
os_version: 'Sierra'
37-
}
38-
};
7+
if(CI === 'TRAVIS') {
8+
module.exports = karmaConfig
9+
}
10+
else if (CI === 'BS') {
11+
module.exports = function (config) {
12+
karmaConfig(config)
3913

40-
// Override config for CI.
41-
config.set({
42-
reporters: ['progress'],
43-
// sauceLabs: {
44-
// testName: 'workfront-api CI tests',
45-
// recordScreenshots: false,
46-
// connectOptions: {
47-
// port: 5757
48-
// },
49-
// public: 'public'
50-
// },
51-
// captureTimeout: 120000,
52-
browserStack: {
53-
username: process.env.BROWSERSTACK_USER,
54-
accessKey: process.env.BROWSERSTACK_ACCESSKEY,
55-
},
56-
customLaunchers: customLaunchers,
14+
// Browsers to run on Sauce Labs
15+
const customLaunchers = {
16+
'bs_chrome_mac': {
17+
base: 'BrowserStack',
18+
browser: 'chrome',
19+
browser_version: '56.0',
20+
os: 'OS X',
21+
os_version: 'Sierra'
22+
},
23+
'bs_firefox_mac': {
24+
base: 'BrowserStack',
25+
browser: 'firefox',
26+
browser_version: '52.0',
27+
os: 'OS X',
28+
os_version: 'Sierra'
29+
},
30+
'bs_internet_explorer_win': {
31+
base: 'BrowserStack',
32+
browser: 'ie',
33+
browser_version: '11',
34+
os: 'Windows',
35+
os_version: '7'
36+
},
37+
'bs_safari_mac': {
38+
base: 'BrowserStack',
39+
browser: 'safari',
40+
browser_version: '10.0',
41+
os: 'OS X',
42+
os_version: 'Sierra'
43+
}
44+
};
5745

58-
// start these browsers
59-
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
60-
browsers: Object.keys(customLaunchers),
61-
singleRun: true
62-
})
46+
// Override config for CI.
47+
config.set({
48+
reporters: ['progress'],
49+
browserStack: {
50+
username: process.env.BROWSERSTACK_USER,
51+
accessKey: process.env.BROWSERSTACK_ACCESSKEY,
52+
project: 'workfront-api'
53+
},
54+
customLaunchers: customLaunchers,
6355

56+
// start these browsers
57+
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
58+
browsers: Object.keys(customLaunchers),
59+
singleRun: true
60+
})
61+
}
6462
}
63+
else {
64+
console.log('Please specify CI environment variable')
65+
}

package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,8 @@
6464
"webpack": "2.2.1"
6565
},
6666
"scripts": {
67-
"test": "run-s test:phantomjs",
68-
"ci-test": "run-s -n test:phantomjs test:coverage test:saucelabs",
69-
"test:saucelabs": "karma start karma-ci.conf.js",
70-
"test:coverage": "codecov",
71-
"test:phantomjs": "karma start karma.conf.js",
67+
"test": "karma start karma.conf.js",
68+
"ci-test": "karma start karma-ci.conf.js && codecov",
7269
"build": "webpack -p --bail",
7370
"update-online-docs": "gulp publish-docs",
7471
"prepublish": "npm run build",

0 commit comments

Comments
 (0)