Skip to content

Commit e1d874c

Browse files
committed
Refactor .travis.yml running both a local coverage test and a remote browsertesting
1 parent 93dd2dd commit e1d874c

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ env:
88
addons:
99
sauce_connect: true
1010
before_script:
11+
- export DISPLAY=:99.0
1112
- sh -e /etc/init.d/xvfb start
1213
- npm install --quiet -g grunt-cli karma
1314
- npm install
14-
script: grunt
15+
script:
16+
- grunt karma:coverage
17+
- grunt karma:saucelabs || true

Gruntfile.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ module.exports = function(grunt) {
4848
},
4949
coverage: {
5050
singleRun: true,
51+
browsers: ['Firefox'],
5152
reporters: ['progress', 'coverage'],
5253
preprocessors: {
5354
'src/*.js': 'coverage'
@@ -57,9 +58,9 @@ module.exports = function(grunt) {
5758
dir: "coverage/"
5859
}
5960
},
60-
travis: {
61+
saucelabs: {
6162
singleRun: true,
62-
reporters: ['progress', 'coverage', 'saucelabs'],
63+
reporters: ['progress', 'saucelabs'],
6364
preprocessors: {
6465
'src/*.js': 'coverage'
6566
},
@@ -125,5 +126,5 @@ module.exports = function(grunt) {
125126
grunt.task.run('bump-commit');
126127
});
127128
// Development
128-
grunt.registerTask('test', ["karma:travis"]);
129+
grunt.registerTask('test', ["karma:coverage", "karma:saucelabs"]);
129130
};

karma.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ module.exports = function(config) {
55
base: 'SauceLabs',
66
browserName: 'internet explorer',
77
platform: 'Windows 8',
8-
version: '10'
8+
version: '10.0'
99
},
1010
sl_ie11: {
1111
base: 'SauceLabs',
1212
browserName: 'internet explorer',
1313
platform: 'Windows 10',
14-
version: '11'
14+
version: '11.0'
1515
},
1616
sl_ie11: {
1717
base: 'SauceLabs',

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@
3939
"grunt-template": "~0.2.3",
4040
"karma": "~0.13",
4141
"karma-coverage": "0.5.3",
42-
"karma-chrome-launcher": "*",
43-
"karma-firefox-launcher": "*",
44-
"karma-ie-launcher": "*",
4542
"karma-jasmine": "~0.3",
43+
"karma-firefox-launcher": "*",
4644
"karma-sauce-launcher": "~0.3.0",
4745
"sinon": "~1.7.3"
4846
}

0 commit comments

Comments
 (0)