Merge branch 'master' of https://github.com/jamesgary/grunt-contrib-j…

…asmine into jamesgary-master # Conflicts: # README.md # docs/jasmine-options.md # package.json # tasks/jasmine.js
gruntjs · Jan 26, 2016 · e731790 · e731790
2 parents 1786808 + f34f6d1
commit e731790
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/docs/jasmine-options.md b/docs/jasmine-options.md
@@ -26,11 +26,12 @@ Type: `String|Array`
 CSS files that get loaded after the jasmine.css
 
 ## options.version
-Type: `String`  
-Default: `'2.0.1'`
+Type: `String`
+Default: '2.2.0'
 
 This is the jasmine-version which will be used. currently available versions are:
 
+* 2.2.0
 * 2.0.1
 * 2.0.0
 

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "chalk": "^1.0.0",
     "es5-shim": "^4.0.1",
     "grunt-lib-phantomjs": "^1.0.0",
-    "jasmine-core": "^2.0.4",
+    "jasmine-core": "^2.2.0",
     "lodash": "~2.4.1",
     "rimraf": "^2.1.4"
   },

diff --git a/tasks/jasmine.js b/tasks/jasmine.js
@@ -70,7 +70,7 @@ module.exports = function(grunt) {
 
     // Merge task-specific options with these defaults.
     var options = this.options({
-      version: '2.0.1',
+      version: '2.2.0',
       timeout: 10000,
       styles: [],
       specs: [],