Merge pull request #56 from nirnatan/master

add jasmine teamcity reporter

Author: paazmaya

Gruntfile.js

@@ -37,8 +37,12 @@ module.exports = function (grunt) {
             spec_files: [
               '*spec.js'
             ],
-            reporter: {
-              colors: true
+            reporters: {
+              spec: {
+                colors: true
+              },
+              // Uncomment line below to activate teamcity reporter
+              //teamcity: true
             }
           }
         },

README.md

@@ -72,14 +72,31 @@ Jasmine specific configuration. Use empty object,
   spec_dir: 'spec',
   spec_files: ['**/*[sS]pec/.js'],
   helpers: [],
-  reporter: {}
+  reporters: {
+    spec: {}
+  }
 }
 ```
 
 See the [jasmine docs](http://jasmine.github.io/2.4/node.html#section-Configuration) for more information on the supported configuration.
 
-The `reporter` property allows the [Jasmine spec reporter](https://github.com/bcaudan/jasmine-spec-reporter) to be configured.
+The `reporters` property allows the one of 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).
+
+If `teamcity` reporter is set `spec` reporter will be disabled and `teamcity` reporter will be added to the coverage reporters as well.
 
+Example of using `teamcity` reporter:
+```js
+{
+  spec_dir: 'spec',
+  spec_files: ['**/*[sS]pec/.js'],
+  helpers: [],
+  reporters: {
+    teamcity: true
+  }
+}
+```
 
 #### options.coverage
 

package.json

@@ -41,6 +41,7 @@
     "deepmerge": "^0.2.10",
     "istanbul": "^0.4.4",
     "jasmine": "^2.4.1",
+    "jasmine-reporters": "^2.2.0",
     "jasmine-spec-reporter": "^2.5.0"
   },
   "devDependencies": {

tasks/jasmine-node-task.js

@@ -9,7 +9,8 @@ var fs = require('fs'),
 var istanbul = require('istanbul'),
   Jasmine = require('jasmine'),
   SpecReporter = require('jasmine-spec-reporter'),
-  deepmerge = require('deepmerge');
+  deepmerge = require('deepmerge'),
+  reporters = require('jasmine-reporters');
 
 module.exports = function jasmineNodeTask(grunt) {
 
@@ -169,6 +170,21 @@ module.exports = function jasmineNodeTask(grunt) {
     };
   };
 
+  var addReporters = function addReporters(jasmine) {
+    var ropts = options.jasmine.reporters;
+
+    var reporter;
+    if (ropts.teamcity) {
+      reporter = new reporters.TeamCityReporter(); // no options to set
+      reporter.name = 'TeamCity Reporter';
+      jasmine.addReporter(reporter);
+    }
+    else {
+      reporter = new SpecReporter(ropts.spec);
+      reporter.name = 'Spec Reporter';
+      jasmine.addReporter(reporter);
+    }
+  };
 
   var runner = function runner(opts) {
     opts = opts || {};
@@ -187,7 +203,7 @@ module.exports = function jasmineNodeTask(grunt) {
     try {
       var jasmine = new Jasmine();
       jasmine.loadConfig(options.jasmine);
-      jasmine.addReporter(new SpecReporter(options.jasmine.reporter));
+      addReporters(jasmine);
       jasmine.onComplete(function(passed) {
         options.onComplete(passed, opts);
       });
@@ -212,6 +228,12 @@ module.exports = function jasmineNodeTask(grunt) {
     grunt.file.mkdir(reportingDir); // ensure we fail early if we cannot do this
 
     var reportClassNames = options.coverage.report;
+
+    // Add teamcity to the coverage reporter if it was set as jasmine reporter
+    if (options.jasmine.reporters.teamcity && reportClassNames.indexOf('teamcity') === -1) {
+      reportClassNames = reportClassNames.concat(['teamcity']);
+    }
+
     reportClassNames.forEach(function eachReport(reportClassName) {
       reports.push(Report.create(reportClassName, {
         dir: reportingDir,
@@ -253,7 +275,9 @@ module.exports = function jasmineNodeTask(grunt) {
       // Jasmine options
       jasmine: {
         spec_dir: 'spec',
-        reporter: {}
+        reporters: {
+          spec: {}
+        }
       },
 
       // Coverage options
@@ -275,6 +299,13 @@ module.exports = function jasmineNodeTask(grunt) {
       }
     }, this.options());
 
+    // Support old config with Spec reporter only
+    if (options.jasmine.reporter) {
+      options.jasmine.reporters = {
+        spec: options.jasmine.reporter
+      };
+    }
+
     options.jasmine.spec_files = options.jasmine.spec_files || ['**/*[sS]pec.js'];
     if (options.coverage !== false) {
       options.coverage.report = options.coverage.report || ['lcov', 'text-summary'];