Changed reporters to be lazily loaded

lib/Approvals.js

@@ -115,9 +115,11 @@ exports.verify = function (dirName, testName, data, reporters) {
   var options = exports.options;
 
   var namer = new ManualNamer(dirName, testName);
-  var reporter = ReporterFactory.loadReporter(reporters || options.reporters);
+  var reporterFactory = function() {
+    return ReporterFactory.loadReporter(reporters || options.reporters);
+  };
   var writer = new StringWriter(options, data);
-  FileApprover.verify(namer, writer, reporter);
+  FileApprover.verify(namer, writer, reporterFactory);
 };
 
 exports.verifyAsJSON = function(dirName, testName, data, reporters) {

lib/FileApprover.js

@@ -2,16 +2,16 @@ var fs = require('fs');
 var autils = require('./AUtils');
 
 var FileApprover = function () { };
-FileApprover.verify = function (namer, writer, reporter, options) {
+FileApprover.verify = function (namer, writer, reporterFactory, options) {
 
   if (!namer) {
     throw "missing argument 'namer'";
   }
   if (!writer) {
     throw "missing argument 'writer'";
   }
-  if (!reporter) {
-    throw "missing argument 'reporter'";
+  if (!reporterFactory) {
+    throw "missing argument 'reporterFactory'";
   }
 
   var stripBOM = options && options.stripBOM;
@@ -31,6 +31,7 @@ FileApprover.verify = function (namer, writer, reporter, options) {
   }
 
   var throwReporterError = function (msg) {
+    var reporter = reporterFactory();
     var reporterError;
     try {
       reporter.report(approvedFileName, receivedFileName);

lib/Providers/BeforeEachVerifierBase.js

@@ -46,10 +46,12 @@ module.exports = function (Namer, usageSample, options, dirName) {
 
     this.verify = function (data, optionalReporterOverride) {
 
-      var reporter = approvalsExtras.getCurrentReporter(optionalReporterOverride);
+      var reporterFactory = function() {
+        return approvalsExtras.getCurrentReporter(optionalReporterOverride);
+      };
 
       var writer = new StringWriter(options, data);
-      FileApprover.verify(namer, writer, reporter);
+      FileApprover.verify(namer, writer, reporterFactory);
     };
 
     this.verifyAsJSON = function (data, optionalReporterOverride) {

test/FileApproverTests.js

@@ -22,7 +22,7 @@ describe('FileApprover', function () {
   describe("when two files match", function(){
 
     var namer;
-    var reporter;
+    var reporterFactory;
     var writer;
     var config = { appendEOL: false };
 
@@ -31,15 +31,17 @@ describe('FileApprover', function () {
       var fileName = "FileApprover.should_verify_two_files_match";
       namer = new Namer(dir, fileName);
       writer = new StringWriter(config, "HELLO!");
-      reporter = new ShouldFailCustomReporter();
+      reporterFactory = function() {
+        return new ShouldFailCustomReporter();
+      };
     });
 
     it('should verify two files match', function () {
-      FileApprover.verify(namer, writer, reporter);
+      FileApprover.verify(namer, writer, reporterFactory);
     });
 
     it('should remove the received file', function () {
-      FileApprover.verify(namer, writer, reporter);
+      FileApprover.verify(namer, writer, reporterFactory);
       var receivedFileName = namer.getReceivedFile(writer.getFileExtension());
 
       assert.ok(!fs.existsSync(receivedFileName), "Received File should be deleted");
@@ -54,15 +56,15 @@ describe('FileApprover', function () {
         done();
       });
 
-      FileApprover.verify(namer, writer, reporter);
+      FileApprover.verify(namer, writer, reporterFactory);
     });
 
     it('should fail the approver if the writer gives something different', function () {
 
       writer = new StringWriter(config, "BYE");
 
       assert.throws(function() {
-        FileApprover.verify(namer, writer, reporter);
+        FileApprover.verify(namer, writer, reporterFactory);
       });
     });