Skip to content

Commit 1ae9051

Browse files
committed
Hopefully fix Travis CI for PRs once and for all.
1 parent db4e196 commit 1ae9051

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ addons:
99
- google-chrome
1010
packages:
1111
- google-chrome-stable
12+
before_install:
13+
- export CHROME_BIN=chromium-browser
14+
- export DISPLAY=:99.0
15+
- sh -e /etc/init.d/xvfb start
1216
before_script:
1317
- npm install
1418
script:

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ gulp.task('test', function (done) {
2828
gulp.task('test-pr', ['copy', 'dist'], function (done) {
2929
new karma.Server({
3030
configFile: __dirname + '/karma.conf.js',
31-
browsers: ['Firefox', 'Chrome'],
31+
browsers: ['Firefox', 'Chrome_Travis'],
3232
singleRun: true
3333
}, done).start();
3434
});

karma.conf.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ module.exports = function (config) {
1414
colors: true,
1515
logLevel: config.LOG_INFO,
1616
autoWatch: true,
17-
//browsers: ['ChromeCanary', 'Firefox', 'Opera', 'Safari'],
17+
customLaunchers: {
18+
Chrome_Travis: {
19+
base: 'Chrome',
20+
flags: ['--no-sandbox']
21+
}
22+
},
1823
browsers: ['PhantomJS2'],
1924
singleRun: false
2025
});

0 commit comments

Comments
 (0)