From adcb8e69e4f9ecf29d3c824f967fe4f7f8d84d5c Mon Sep 17 00:00:00 2001
From: Aymeric Beaumet <aymeric@beaumet.me>
Date: Thu, 31 Jul 2014 23:34:53 +0200
Subject: [PATCH] fix: reporters can be configured individually

The `subdir` option previously introduced in karma-coverage 0.2.5 brings a
regression: it wasn't possible anymore to configure a specific output
directory/subdirectory for each reporter. This fix makes it possible again.

Fix #91
---
 lib/reporter.js           |  4 ++-
 test/reporter.spec.coffee | 60 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/lib/reporter.js b/lib/reporter.js
index 7396afa..e818402 100644
--- a/lib/reporter.js
+++ b/lib/reporter.js
@@ -124,7 +124,9 @@ var CoverageReporter = function(rootConfig, helper, logger) {
         if (collector) {
           pendingFileWritings++;
 
-          var outputDir = helper.normalizeWinPath(path.resolve(basePath, generateOutputDir(browser.name, config.dir, config.subdir)));
+          var outputDir = helper.normalizeWinPath(path.resolve(basePath, generateOutputDir(browser.name,
+                                                                                           reporterConfig.dir || config.dir,
+                                                                                           reporterConfig.subdir || config.subdir)));
 
           helper.mkdirIfNotExists(outputDir, function() {
             log.debug('Writing coverage to %s', outputDir);
diff --git a/test/reporter.spec.coffee b/test/reporter.spec.coffee
index 63050f4..9fa8505 100644
--- a/test/reporter.spec.coffee
+++ b/test/reporter.spec.coffee
@@ -144,7 +144,6 @@ describe 'reporter', ->
 
     it 'should support a string for the subdir option', ->
       customConfig = _.merge {}, rootConfig,
-        subdir: 'test'
         coverageReporter:
           subdir: 'test'
 
@@ -164,7 +163,6 @@ describe 'reporter', ->
 
     it 'should support a function for the subdir option', ->
       customConfig = _.merge {}, rootConfig,
-        subdir: 'test'
         coverageReporter:
           subdir: (browserName) -> browserName.toLowerCase().split(/[ /-]/)[0]
 
@@ -180,3 +178,61 @@ describe 'reporter', ->
       mockMkdir.getCall(0).args[1]()
       expect(mockReportCreate).to.have.been.called
       expect(mockWriteReport).to.have.been.called
+
+    it 'should support a specific dir and subdir per reporter', ->
+      customConfig = _.merge {}, rootConfig,
+        coverageReporter:
+          dir: 'useless'
+          subdir: 'useless'
+          reporters: [
+            {
+              dir: 'reporter1'
+              subdir: (browserName) -> browserName.toLowerCase().split(/[ /-]/)[0]
+            }
+            {
+              dir: 'reporter2'
+              subdir: (browserName) -> browserName.toUpperCase().split(/[ /-]/)[0]
+            }
+          ]
+
+      reporter = new m.CoverageReporter customConfig, mockHelper, mockLogger
+      reporter.onRunStart()
+      browsers.forEach (b) -> reporter.onBrowserStart b
+
+      reporter.onRunComplete browsers
+      expect(mockMkdir.callCount).to.equal 4
+      expect(mockMkdir.getCall(0).args[0]).to.deep.equal path.resolve('/base', 'reporter1', 'chrome')
+      expect(mockMkdir.getCall(1).args[0]).to.deep.equal path.resolve('/base', 'reporter1', 'opera')
+      expect(mockMkdir.getCall(2).args[0]).to.deep.equal path.resolve('/base', 'reporter2', 'CHROME')
+      expect(mockMkdir.getCall(3).args[0]).to.deep.equal path.resolve('/base', 'reporter2', 'OPERA')
+      mockMkdir.getCall(0).args[1]()
+      expect(mockReportCreate).to.have.been.called
+      expect(mockWriteReport).to.have.been.called
+
+    it 'should fallback to the default dir/subdir if not provided', ->
+      customConfig = _.merge {}, rootConfig,
+        coverageReporter:
+          dir: 'defaultdir'
+          subdir: 'defaultsubdir'
+          reporters: [
+            {
+              dir: 'reporter1'
+            }
+            {
+              subdir: (browserName) -> browserName.toUpperCase().split(/[ /-]/)[0]
+            }
+          ]
+
+      reporter = new m.CoverageReporter customConfig, mockHelper, mockLogger
+      reporter.onRunStart()
+      browsers.forEach (b) -> reporter.onBrowserStart b
+
+      reporter.onRunComplete browsers
+      expect(mockMkdir.callCount).to.equal 4
+      expect(mockMkdir.getCall(0).args[0]).to.deep.equal path.resolve('/base', 'reporter1', 'defaultsubdir')
+      expect(mockMkdir.getCall(1).args[0]).to.deep.equal path.resolve('/base', 'reporter1', 'defaultsubdir')
+      expect(mockMkdir.getCall(2).args[0]).to.deep.equal path.resolve('/base', 'defaultdir', 'CHROME')
+      expect(mockMkdir.getCall(3).args[0]).to.deep.equal path.resolve('/base', 'defaultdir', 'OPERA')
+      mockMkdir.getCall(0).args[1]()
+      expect(mockReportCreate).to.have.been.called
+      expect(mockWriteReport).to.have.been.called