Skip to content
Browse files

Travis compatibility fixed. Again.

  • Loading branch information...
1 parent bda4deb commit 92840e9a2534fc355e13fe776fbb6e879176ea12 @inossidabile inossidabile committed
Showing with 2 additions and 3 deletions.
  1. +1 −1 .travis.yml
  2. +1 −2 Gruntfile.coffee
View
2 .travis.yml
@@ -5,7 +5,7 @@ before_script:
- npm install -g phantomjs
- npm install -g grunt-cli
- ./node_modules/.bin/bower -V install
-script: "grunt"
+script: "grunt --launch=phantomjs"
branches:
except:
- 1.0
View
3 Gruntfile.coffee
@@ -20,7 +20,6 @@ module.exports = (grunt) ->
]
testemOptions =
- parallel: 8
launch_in_dev: ['PhantomJS'],
launch_in_ci: ['PhantomJS', 'Chrome', 'Firefox', 'Safari', 'IE7', 'IE8', 'IE9']
@@ -103,7 +102,7 @@ module.exports = (grunt) ->
#
# Main tasks
#
- grunt.registerTask 'default', ['testem:generate', 'testem:ci']
+ grunt.registerTask 'default', 'testem'
grunt.registerTask 'test', ->
grunt.fatal "Specify module to run manual tests for" unless @args[0]

0 comments on commit 92840e9

Please sign in to comment.
Something went wrong with that request. Please try again.