Update renderers test and fixed console display of those tests

barracksiot · May 30, 2017 · 88b60ca · 88b60ca
1 parent 8b1b3a3
commit 88b60ca
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 20 deletions.
diff --git a/tests/renderers/jsonRenderer.spec.js b/tests/renderers/jsonRenderer.spec.js
@@ -22,10 +22,20 @@ describe('jsonRenderer', () => {
 
   const originalConsoleLog = console.log;
   const originalConsoleError = console.error;
+  let consoleLogSpy;
+  let consoleErrorSpy;
 
   beforeEach(() => {
-    console.log = sinon.spy();
-    console.error = sinon.spy();
+    consoleLogSpy = sinon.spy();
+    consoleErrorSpy = sinon.spy();
+    console.log = (data) => {
+      consoleLogSpy(data);
+      originalConsoleLog(data);
+    };
+    console.error = (data) => {
+      consoleErrorSpy(data);
+      originalConsoleError(data);
+    };
   });
 
   afterEach(() => {
@@ -42,8 +52,8 @@ describe('jsonRenderer', () => {
 
     // When / Then
     jsonRenderer(promise).then(() => {
-      expect(console.log).to.have.been.calledOnce;
-      expect(console.log).to.have.been.calledWithExactly(JSON.stringify(object));
+      expect(consoleLogSpy).to.have.been.calledOnce;
+      expect(consoleLogSpy).to.have.been.calledWithExactly(JSON.stringify(object));
       done();
     }).catch(err => {
       done(err);
@@ -57,11 +67,11 @@ describe('jsonRenderer', () => {
 
     // When / Then
     jsonRenderer(promise).then(() => {
-      expect(console.error).to.have.been.calledOnce;
-      expect(console.error).to.have.been.calledWithExactly(JSON.stringify({ error }));
-      done();
+      done('Should have failed');
     }).catch(err => {
-      done(err);
+      expect(consoleErrorSpy).to.have.been.calledOnce;
+      expect(consoleErrorSpy).to.have.been.calledWithExactly(JSON.stringify({ error }));
+      done();
     });
   });
 
@@ -77,7 +87,7 @@ describe('jsonRenderer', () => {
       stream.write(chunk1);
       stream.write(chunk2);
       stream.lastPage();
-      expect(getRenderedJson(console.log)).to.be.deep.equal([].concat(chunk1, chunk2));
+      expect(getRenderedJson(consoleLogSpy)).to.be.deep.equal([].concat(chunk1, chunk2));
       done();
     }).catch(err => {
       done(err);
@@ -90,7 +100,7 @@ describe('jsonRenderer', () => {
 
     // When / Then
     jsonRenderer(promise).then(() => {
-      expect(console.log).to.not.have.been.calledOnce;
+      expect(consoleLogSpy).to.not.have.been.calledOnce;
       done();
     }).catch(err => {
       done(err);

diff --git a/tests/renderers/prettyRenderer.spec.js b/tests/renderers/prettyRenderer.spec.js
@@ -15,10 +15,20 @@ describe('prettyRenderer', () => {
   const originalConsoleLog = console.log;
   const originalConsoleError = console.error;
   const originalPrettyRender = prettyjson.render;
+  let consoleLogSpy;
+  let consoleErrorSpy;
 
   beforeEach(() => {
-    console.log = sinon.spy();
-    console.error = sinon.spy();
+    consoleLogSpy = sinon.spy();
+    consoleErrorSpy = sinon.spy();
+    console.log = (data) => {
+      consoleLogSpy(data);
+      originalConsoleLog(data);
+    };
+    console.error = (data) => {
+      consoleErrorSpy(data);
+      originalConsoleError(data);
+    };
   });
 
   afterEach(() => {
@@ -38,8 +48,8 @@ describe('prettyRenderer', () => {
     prettyRenderer(promise).then(() => {
       expect(prettyjson.render).to.have.been.calledOnce;
       expect(prettyjson.render).to.have.been.calledWithExactly(object);
-      expect(console.log).to.have.been.calledOnce;
-      expect(console.log).to.have.been.calledWithExactly(prettyString);
+      expect(consoleLogSpy).to.have.been.calledOnce;
+      expect(consoleLogSpy).to.have.been.calledWithExactly(prettyString);
       done();
     }).catch(err => {
       done(err);
@@ -51,14 +61,15 @@ describe('prettyRenderer', () => {
     const error = 'Error';
     const promise = Promise.reject(error);
     prettyjson.render = sinon.spy();
+
     // When / Then
     prettyRenderer(promise).then(() => {
+      done('Should have failed');
+    }).catch(err => {
       expect(prettyjson.render).to.have.not.been.called;
-      expect(console.error).to.have.been.calledOnce;
-      expect(console.error).to.have.been.calledWithExactly(error);
+      expect(consoleErrorSpy).to.have.been.calledOnce;
+      expect(consoleErrorSpy).to.have.been.calledWithExactly(error);
       done();
-    }).catch(err => {
-      done(err);
     });
   });
 
@@ -77,8 +88,8 @@ describe('prettyRenderer', () => {
       stream.write(chunk2);
       stream.lastPage();
       expect(prettyjson.render).to.have.been.called.twice;
-      expect(console.log).to.have.been.called.twice;
-      expect(console.log).to.have.always.been.calledWithExactly(prettyString);
+      expect(consoleLogSpy).to.have.been.called.twice;
+      expect(consoleLogSpy).to.have.always.been.calledWithExactly(prettyString);
       done();
     }).catch(err => {
       done(err);