Skip to content

Commit 57389ff

Browse files
committed
1 parent a9da0fc commit 57389ff

5 files changed

+48
-1
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
language: node_js
22
node_js: ["0.10"]
3+
before_install:
4+
- export CHROME_BIN=chromium-browser
5+
- export DISPLAY=:99.0
6+
- sh -e /etc/init.d/xvfb start
37
before_script:
48
- npm install -g bower gulp
59
- bower install

gulpfile.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ gulp.task('lint', function () {
7272
module: true,
7373
require: true,
7474
__dirname: true,
75-
document: true
75+
document: true,
76+
process: true,
77+
configuration: true
7678
}
7779
}))
7880
// Outputs the results to the console

karma-dist-concatenated.conf.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,22 @@ module.exports = function(config) {
6767
browsers: ['Chrome'],
6868

6969

70+
// Use a custom launcher to run Chrome on TravisCI
71+
customLaunchers: {
72+
Chrome_travis_ci: {
73+
base: 'Chrome',
74+
flags: ['--no-sandbox']
75+
}
76+
},
77+
78+
7079
// Continuous Integration mode
7180
// if true, Karma captures browsers, runs the tests and exits
7281
singleRun: false
7382
});
7483
};
84+
85+
// Switch browser to Chrome if TravisCI is detected
86+
if (process.env.TRAVIS) {
87+
configuration.browsers = ['Chrome_travis_ci'];
88+
}

karma-dist-minified.conf.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,21 @@ module.exports = function(config) {
6767
browsers: ['Chrome'],
6868

6969

70+
// Use a custom launcher to run Chrome on TravisCI
71+
customLaunchers: {
72+
Chrome_travis_ci: {
73+
base: 'Chrome',
74+
flags: ['--no-sandbox']
75+
}
76+
},
77+
7078
// Continuous Integration mode
7179
// if true, Karma captures browsers, runs the tests and exits
7280
singleRun: false
7381
});
7482
};
83+
84+
// Switch browser to Chrome if TravisCI is detected
85+
if (process.env.TRAVIS) {
86+
configuration.browsers = ['Chrome_travis_ci'];
87+
}

karma-src.conf.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,22 @@ module.exports = function(config) {
6868
browsers: ['Chrome'],
6969

7070

71+
// Use a custom launcher to run Chrome on TravisCI
72+
customLaunchers: {
73+
Chrome_travis_ci: {
74+
base: 'Chrome',
75+
flags: ['--no-sandbox']
76+
}
77+
},
78+
79+
7180
// Continuous Integration mode
7281
// if true, Karma captures browsers, runs the tests and exits
7382
singleRun: false
7483
});
7584
};
85+
86+
// Switch browser to Chrome if TravisCI is detected
87+
if (process.env.TRAVIS) {
88+
configuration.browsers = ['Chrome_travis_ci'];
89+
}

0 commit comments

Comments
 (0)