Skip to content

Commit

Permalink
chore(travis): merge cloudtest into one task
Browse files Browse the repository at this point in the history
  • Loading branch information
ajoslin committed Feb 21, 2014
1 parent 2afde2c commit 8847b07
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
10 changes: 9 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,14 @@ module.exports = function(grunt) {
'concat:bundlemin'
]);

grunt.registerTask('cloudtest', [
'sauce-connect',
'karma:sauce',
'connect',
'exec:e2e-sauce',
'sauce-disconnect'
]);

grunt.registerMultiTask('karma', 'Run karma', function() {
var done = this.async();
var options = this.options();
Expand Down Expand Up @@ -269,7 +277,7 @@ module.exports = function(grunt) {
username: process.env.SAUCE_USER,
accessKey: process.env.SAUCE_KEY,
verbose: true,
tunnelIdentifier: process.env.TRAVIS_BUILD_NUMBER,
tunnelIdentifier: process.env.TRAVIS_BUILD_NUMBER
}, function(err, instance) {
if (err) {
grunt.fail.fatal('Failed to launch sauce connect!', err);
Expand Down
2 changes: 1 addition & 1 deletion scripts/travis/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ function run {
echo ""

# Do sauce unit tests and e2e tests with all browsers (takes longer)
grunt sauce-connect karma:sauce --reporters=dots exec:e2e-sauce sauce-disconnect
grunt cloudtest

echo ""
echo "--- Build and tests complete! ---"
Expand Down

0 comments on commit 8847b07

Please sign in to comment.