Merge branch 'master' into master

Author: paazmaya

Gruntfile.js

@@ -41,6 +41,10 @@ module.exports = function (grunt) {
               spec: {
                 colors: true
               },
+              junitXml: {
+                savePath: "reports",
+                consolidateAll: true
+              }
               // Uncomment line below to activate teamcity reporter
               //teamcity: true
             }

README.md

@@ -80,10 +80,12 @@ Jasmine specific configuration. Use empty object,
 
 See the [jasmine docs](http://jasmine.github.io/2.4/node.html#section-Configuration) for more information on the supported configuration.
 
-The `reporters` property allows the one of the following properties:
+The `reporters` property allows the following properties:
 
 * `spec`: used to configure the [Jasmine spec reporter](https://github.com/bcaudan/jasmine-spec-reporter).
 * `teamcity` set it to `true` in order to use [Jasmine Reporters - TeamCityReporter](https://github.com/larrymyers/jasmine-reporters).
+* `junitXml` set it to a object to use [Jasmine Reporters - JUnitXmlReporter](https://github.com/larrymyers/jasmine-reporters).  See the jasmine-reporters
+documentation for additional configuration options.
 
 If `teamcity` reporter is set `spec` reporter will be disabled and `teamcity` reporter will be added to the coverage reporters as well.
 
@@ -100,6 +102,21 @@ Example of using `teamcity` reporter:
 }
 ```
 
+Example of using `junitXml` reporter:
+
+```js
+{
+  spec_dir: 'spec',
+  spec_files: ['**/*[sS]pec/.js'],
+  helpers: [],
+  reporters: {
+  junitXml: {
+    savePath: "reports",
+    consolidateAll: true
+  }
+}
+```
+
 #### options.coverage
 
 Type: `object`
@@ -283,10 +300,13 @@ app/
 Please note that the junit reporter is no longer available. If you are using this reporter and wish to update to v1, please open a new issue and we'll see if we can get it added back in. Even better, submit a PR :smile:
 
 ## Release History
+
 * `unreleased`
- - **Breaking changes alert! Ensure you read the migration guide before updating from previous versions**
- - Updated to jasmine-spec-reporter v3.1.0. Older style configuration needs to be updated, see migration guide for more details.
- - Removed support for Node.js v0.10
+  - **Breaking changes alert! Ensure you read the migration guide before updating from previous versions**
+  - Updated to jasmine-spec-reporter v3.1.0. Older style configuration needs to be updated, see migration guide for more details.
+  - Removed support for Node.js v0.10
+* `v1.2.0` (2017-04-30)
+  - Was compatible with Grunt `0.4` all the time, hence lowering the dependency requirement #60
 * `v1.1.1` (2016-08-29)
   - Istanbul `v0.4.5` and using `data.src` instead of `fileSrc` for compatibility #59
 * `v1.1.0` (2016-08-23)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "grunt-jasmine-node-coverage",
   "description": "Grunt task for running jasmine using istanbul for code coverage reports. Based off of grunt-jasmine-node by Omar Gonzalez (s9tpepper).",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "homepage": "https://github.com/jribble/grunt-jasmine-node-coverage",
   "author": {
     "name": "Jarrod Ribble",
@@ -37,7 +37,7 @@
     "README.md"
   ],
   "dependencies": {
-    "deepmerge": "^1.3.1",
+    "deepmerge": "^1.3.2",
     "istanbul": "^0.4.5",
     "jasmine": "^2.5.2",
     "jasmine-reporters": "^2.2.0",

tasks/jasmine-node-task.js

@@ -182,11 +182,16 @@ module.exports = function jasmineNodeTask(grunt) {
       reporter.name = 'TeamCity Reporter';
       jasmine.addReporter(reporter);
     }
-    else {
+    else if (ropts.spec) {
       reporter = new SpecReporter(ropts.spec);
       reporter.name = 'Spec Reporter';
       jasmine.addReporter(reporter);
     }
+
+    if (ropts.junitXml){
+      reporter = new reporters.JUnitXmlReporter(ropts.junitXml);
+      jasmine.addReporter(reporter);
+    }
   };
 
   var runner = function runner(opts) {
@@ -279,7 +284,6 @@ module.exports = function jasmineNodeTask(grunt) {
       jasmine: {
         spec_dir: 'spec',
         reporters: {
-          spec: {}
         }
       },