Skip to content

Commit ac76fb4

Browse files
committed
Chrome fixes for travis - karma-runner/karma#1144
1 parent 7fbaafe commit ac76fb4

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
language: node_js
22
node_js:
3+
- "0.10"
34
- "0.12"
45
- "4.0"
56
before_script:
7+
- export CHROME_BIN=chromium-browser
68
- export DISPLAY=:99.0
79
- sh -e /etc/init.d/xvfb start
810
email:
911
on_failure: change
1012
on_success: never
13+

karma.conf.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,14 @@ module.exports = function(config) {
6464

6565
autoWatch: false,
6666

67-
browsers: ['PhantomJS', 'Firefox', 'Chrome'],
67+
browsers: ['PhantomJS', 'Firefox', process.env.TRAVIS ? 'Chrome_travis_ci' : 'Chrome'],
68+
69+
customLaunchers: {
70+
Chrome_travis_ci: {
71+
base: 'Chrome',
72+
flags: ['--no-sandbox']
73+
}
74+
},
6875

6976
singleRun: false,
7077

0 commit comments

Comments
 (0)