Merge pull request #257 from appleboy/develop

fixed #256 mocha options.
yeoman · May 1, 2014 · e8a49e7 · e8a49e7
2 parents b0c8f5a + 4256d56
commit e8a49e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
@@ -148,7 +148,7 @@ module.exports = function (grunt) {
             all: {
                 options: {
                     run: true,
-                    src: ['http://localhost:<%%= connect.test.options.port %>/index.html']
+                    urls: ['http://localhost:<%%= connect.test.options.port %>/index.html']
                 }
             }
         }<% } else { %>,

diff --git a/app/templates/_package.json b/app/templates/_package.json
@@ -20,7 +20,7 @@
     "grunt-contrib-imagemin": "~0.5.0",
     "grunt-contrib-watch": "~0.5.3",<% if (testFramework === 'jasmine') { %>
     "grunt-contrib-jasmine": "~0.5.2",<% }else{ %>
-    "grunt-mocha": "~0.4.9",<% } %>
+    "grunt-mocha": "~0.4.10",<% } %>
     "grunt-usemin": "~0.1.12",<% if(includeRequireJS){ %>
     "grunt-bower-requirejs": "~0.8.3",
     "grunt-requirejs": "~0.4.0",<% } %>