oh travis

yyx990803 · yyx990803 · commit 098a3cdd3bfd · 2015-06-12T14:58:46.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- "0.12"
+- "iojs-v2.0.1"
 branches:
   only:
   - master
diff --git a/gruntfile.js b/gruntfile.js
@@ -72,7 +72,7 @@ module.exports = function (grunt) {
 
     coveralls: {
       options: {
-        coverage_dir: 'coverage/',
+        coverageDir: 'coverage/',
         force: true
       }
     }
@@ -97,4 +97,4 @@ module.exports = function (grunt) {
   grunt.registerTask('ci', ['jshint', 'cover', 'coveralls', 'build', 'casper', 'sauce'])
   grunt.registerTask('default', ['jshint', 'build', 'test'])
 
-}
+}
diff --git a/package.json b/package.json
@@ -39,6 +39,6 @@
     "semver": "^4.2.0",
     "shell-task": "^1.0.0",
     "uglify-js": "^2.4.20",
-    "webpack": "^1.8.4"
+    "webpack": "^1.9.10"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ module.exports = function (grunt) {`
`72`	`72`
`73`	`73`	`coveralls: {`
`74`	`74`	`options: {`
`75`		`- coverage_dir: 'coverage/',`
	`75`	`+ coverageDir: 'coverage/',`
`76`	`76`	`force: true`
`77`	`77`	`}`
`78`	`78`	`}`
`@@ -97,4 +97,4 @@ module.exports = function (grunt) {`
`97`	`97`	`grunt.registerTask('ci', ['jshint', 'cover', 'coveralls', 'build', 'casper', 'sauce'])`
`98`	`98`	`grunt.registerTask('default', ['jshint', 'build', 'test'])`
`99`	`99`
`100`		`-}`
	`100`	`+}`