combine iOS and IE matrix tests
Thomas Aylott committed
Dec 4, 2013 at 15:53 UTC
4af362b75140ed25a8772ff9612fd49691866cab
2 files changed
+27
-10
.travis.yml
+4
-10
@@ -26,11 +26,8 @@ env:
26
matrix:
27
- TEST_TYPE=test:full
28
- TEST_TYPE=lint
29
- - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
30
- - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
31
- - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
32
- - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
33
- - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios6
29
+ - TEST_TYPE=test:webdriver:saucelabs:ie
30
+ - TEST_TYPE=test:webdriver:saucelabs:ios
31
- TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=safari
32
global:
33
# SERVER
@@ -41,11 +38,8 @@ matrix:
38
fast_finish: true
39
allow_failures:
40
- env: TEST_TYPE=lint
44
- - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
45
- - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
46
- - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
47
- - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
48
- - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios6
41
+ - env: TEST_TYPE=test:webdriver:saucelabs:ie
42
+ - env: TEST_TYPE=test:webdriver:saucelabs:ios
43
- env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=safari
44
notifications:
45
irc:
Gruntfile.js
+23
@@ -142,6 +142,29 @@ module.exports = function(grunt) {
142
'webdriver-jasmine:saucelabs_' + (process.env.BROWSER_NAME || 'ie8'),
143
]);
144
145
+ grunt.registerTask('test:webdriver:saucelabs:ie', [
146
+ 'build:test',
147
+ 'build:basic',
148
+
149
+ 'connect',
150
+ 'sauce-tunnel',
151
+ 'webdriver-jasmine:saucelabs_ie8',
152
+ 'webdriver-jasmine:saucelabs_ie9',
153
+ 'webdriver-jasmine:saucelabs_ie10',
154
+ 'webdriver-jasmine:saucelabs_ie11'
155
+ ]);
156
+
157
+ grunt.registerTask('test:webdriver:saucelabs:ios', [
158
+ 'build:test',
159
+ 'build:basic',
160
+
161
+ 'connect',
162
+ 'sauce-tunnel',
163
+ 'webdriver-jasmine:saucelabs_ios6_1',
164
+ 'webdriver-jasmine:saucelabs_ios5_1',
165
+ 'webdriver-jasmine:saucelabs_ios4'
166
+ ]);
167
+
168
grunt.registerTask('test:coverage', [
169
'build:test',
170
'build:withCodeCoverageLogging',