new grunt test:full task tests in many browsers

Moved the travis specific stuff back into the travis file
This commit is contained in:
Thomas Aylott
2013-12-04 14:27:06 -05:00
parent e560229c83
commit e944b68e8c
2 changed files with 19 additions and 4 deletions
+3 -2
View File
@@ -7,7 +7,8 @@ script:
grunt $TEST_TYPE
after_script:
- |
if [ "$TEST_TYPE" = unit ] && [ "$SERVER" ]; then
if [ "$TEST_TYPE" = test:full ] && [ "$SERVER" ]; then
grunt build
curl \
-F "react=@build/react.js" \
-F "react.min=@build/react.min.js" \
@@ -23,7 +24,7 @@ after_script:
fi
env:
matrix:
- TEST_TYPE=unit
- TEST_TYPE=test:full
- TEST_TYPE=lint
- TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
- TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
+16 -2
View File
@@ -35,8 +35,6 @@ module.exports = function(grunt) {
.filter(function(npmTaskName) { return npmTaskName != 'grunt-cli'; })
.forEach(function(npmTaskName) { grunt.loadNpmTasks(npmTaskName); });
grunt.registerTask('unit', ['build', 'test']);
// Alias 'jshint' to 'lint' to better match the workflow we know
grunt.registerTask('lint', ['jshint']);
@@ -112,6 +110,22 @@ module.exports = function(grunt) {
'webdriver-jasmine:local'
]);
grunt.registerTask('test:full', [
'build:test',
'build:basic',
'connect',
'webdriver-phantomjs',
'webdriver-jasmine:local',
'sauce-tunnel',
'webdriver-jasmine:saucelabs_ios',
'webdriver-jasmine:saucelabs_android',
'webdriver-jasmine:saucelabs_firefox',
'webdriver-jasmine:saucelabs_chrome',
'webdriver-jasmine:saucelabs_safari'
]);
grunt.registerTask('test:webdriver:saucelabs', [
'build:test',
'build:basic',