Skip to content

Commit 51b5757

Browse files
committed
build setting fixes
1 parent cf64eed commit 51b5757

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@ language: node_js
22

33
node_js:
44
- '7'
5+
6+
before_install:
7+
- export CHROME_BIN=chromium-browser
8+
- export DISPLAY=:99.0
9+
- sh -e /etc/init.d/xvfb start

tests/karma.conf.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = function (config) {
2-
config.set({
2+
const cfg = {
33
basePath: '',
44
frameworks: ['jasmine'],
55
files: [
@@ -10,7 +10,7 @@ module.exports = function (config) {
1010
preprocessors: {
1111
'./main.js': ['webpack', 'sourcemap']
1212
},
13-
webpack: require('./webpack-spec.config')({env: 'test'}),
13+
webpack: require('./webpack-spec.config')({ env: 'test' }),
1414
reporters: ['progress'],
1515
port: 9876,
1616
colors: true,
@@ -19,5 +19,11 @@ module.exports = function (config) {
1919
browsers: ['Chrome'],
2020
singleRun: true,
2121
concurrency: Infinity
22-
})
22+
};
23+
24+
if (process.env.TRAVIS) {
25+
cfg.browsers = ['Chrome_travis_ci'];
26+
}
27+
28+
config.set(cfg);
2329
}

0 commit comments

Comments
 (0)