Merge branch 'pr-console-error' of github.com:ddterm/jasmine

Merges jasmine#2110 from @amezin

Author: sgravrock

lib/jasmine-core/jasmine.js

@@ -449,6 +449,11 @@ getJasmineRequireObj().base = function(j$, private$, jasmineGlobal) {
     );
   };
 
+  private$.consoleError = function(...args) {
+    // eslint-disable-next-line no-console
+    console.error(...args);
+  };
+
   /**
    * Get an {@link AsymmetricEqualityTester} that will succeed if the actual
    * value being compared matches every provided equality tester.
@@ -1523,10 +1528,10 @@ getJasmineRequireObj().Env = function(j$, private$) {
 
       // If we get here, all results have been reported and there's nothing we
       // can do except log the result and hope the user sees it.
-      // eslint-disable-next-line no-console
-      console.error('Jasmine received a result after the suite finished:');
-      // eslint-disable-next-line no-console
-      console.error(expectationResult);
+      private$.consoleError(
+        'Jasmine received a result after the suite finished:'
+      );
+      private$.consoleError(expectationResult);
     }
 
     const asyncExpectationFactory = function(actual, spec, runableType) {
@@ -3794,8 +3799,7 @@ getJasmineRequireObj().Deprecator = function(j$, private$) {
 
   Deprecator.prototype.log_ = function(runnable, deprecation, options) {
     if (private$.isError(deprecation)) {
-      // eslint-disable-next-line no-console
-      console.error(deprecation);
+      private$.consoleError(deprecation);
       return;
     }
 
@@ -3817,8 +3821,7 @@ getJasmineRequireObj().Deprecator = function(j$, private$) {
       context += '\n' + verboseNote;
     }
 
-    // eslint-disable-next-line no-console
-    console.error('DEPRECATION: ' + deprecation + context);
+    private$.consoleError('DEPRECATION: ' + deprecation + context);
   };
 
   Deprecator.prototype.stackTrace_ = function() {
@@ -8544,8 +8547,7 @@ getJasmineRequireObj().QueueRunner = function(j$, private$) {
   }
 
   function fallbackOnMultipleDone() {
-    // eslint-disable-next-line no-console
-    console.error(
+    private$.consoleError(
       new Error(
         "An asynchronous function called its 'done' " +
           'callback more than once, in a QueueRunner without a onMultipleDone ' +
@@ -8669,8 +8671,7 @@ getJasmineRequireObj().QueueRunner = function(j$, private$) {
           // Any error we catch here is probably due to a bug in Jasmine,
           // and it's not likely to end up anywhere useful if we let it
           // propagate. Log it so it can at least show up when debugging.
-          // eslint-disable-next-line no-console
-          console.error(error);
+          private$.consoleError(error);
         }
       }
     );

spec/core/DeprecatorSpec.js

@@ -1,8 +1,7 @@
-/* eslint no-console: 0 */
 describe('Deprecator', function() {
   describe('#deprecate', function() {
     beforeEach(function() {
-      spyOn(console, 'error');
+      spyOn(privateUnderTest, 'consoleError');
     });
 
     it('logs the mesage without context when the runnable is the top suite', function() {
@@ -14,7 +13,9 @@ describe('Deprecator', function() {
         omitStackTrace: true
       });
 
-      expect(console.error).toHaveBeenCalledWith('DEPRECATION: the message');
+      expect(privateUnderTest.consoleError).toHaveBeenCalledWith(
+        'DEPRECATION: the message'
+      );
     });
 
     it('logs the message in a descendant suite', function() {
@@ -32,7 +33,7 @@ describe('Deprecator', function() {
         omitStackTrace: true
       });
 
-      expect(console.error).toHaveBeenCalledWith(
+      expect(privateUnderTest.consoleError).toHaveBeenCalledWith(
         'DEPRECATION: the message (in suite: the suite)'
       );
     });
@@ -51,7 +52,7 @@ describe('Deprecator', function() {
         omitStackTrace: true
       });
 
-      expect(console.error).toHaveBeenCalledWith(
+      expect(privateUnderTest.consoleError).toHaveBeenCalledWith(
         'DEPRECATION: the message (in spec: the spec)'
       );
     });
@@ -78,10 +79,10 @@ describe('Deprecator', function() {
         })
       );
       expect(runnable.addDeprecationWarning).not.toHaveBeenCalled();
-      expect(console.error).toHaveBeenCalledWith(
+      expect(privateUnderTest.consoleError).toHaveBeenCalledWith(
         jasmine.stringMatching(/the message/)
       );
-      expect(console.error).not.toHaveBeenCalledWith(
+      expect(privateUnderTest.consoleError).not.toHaveBeenCalledWith(
         jasmine.stringMatching(/a spec/)
       );
     });
@@ -176,8 +177,8 @@ describe('Deprecator', function() {
       expect(
         runnable.addDeprecationWarning.calls.argsFor(0)[0].message
       ).toContain(verboseDeprecationsNote());
-      expect(console.error).toHaveBeenCalledTimes(1);
-      expect(console.error.calls.argsFor(0)[0]).toContain(
+      expect(privateUnderTest.consoleError).toHaveBeenCalledTimes(1);
+      expect(privateUnderTest.consoleError.calls.argsFor(0)[0]).toContain(
         verboseDeprecationsNote()
       );
     });
@@ -196,8 +197,8 @@ describe('Deprecator', function() {
       expect(
         runnable.addDeprecationWarning.calls.argsFor(0)[0].message
       ).not.toContain(verboseDeprecationsNote());
-      expect(console.error).toHaveBeenCalledTimes(1);
-      expect(console.error.calls.argsFor(0)[0]).not.toContain(
+      expect(privateUnderTest.consoleError).toHaveBeenCalledTimes(1);
+      expect(privateUnderTest.consoleError.calls.argsFor(0)[0]).not.toContain(
         verboseDeprecationsNote()
       );
     });
@@ -230,11 +231,13 @@ describe('Deprecator', function() {
         expect(runnable.addDeprecationWarning.calls.argsFor(0)[0].stack).toBe(
           originalStack
         );
-        expect(console.error).toHaveBeenCalledTimes(1);
-        expect(console.error.calls.argsFor(0)[0].message).toEqual(
-          'the deprecation'
+        expect(privateUnderTest.consoleError).toHaveBeenCalledTimes(1);
+        expect(
+          privateUnderTest.consoleError.calls.argsFor(0)[0].message
+        ).toEqual('the deprecation');
+        expect(privateUnderTest.consoleError.calls.argsFor(0)[0].stack).toEqual(
+          originalStack
         );
-        expect(console.error.calls.argsFor(0)[0].stack).toEqual(originalStack);
       });
 
       it('reports the deprecation every time, regardless of config.verboseDeprecations', function() {
@@ -255,7 +258,7 @@ describe('Deprecator', function() {
         deprecator.addDeprecationWarning(runnable, deprecation);
 
         expect(runnable.addDeprecationWarning).toHaveBeenCalledTimes(2);
-        expect(console.error).toHaveBeenCalledTimes(2);
+        expect(privateUnderTest.consoleError).toHaveBeenCalledTimes(2);
       });
 
       it('omits the note about verboseDeprecations', function() {
@@ -278,8 +281,8 @@ describe('Deprecator', function() {
         expect(
           runnable.addDeprecationWarning.calls.argsFor(0)[0].message
         ).not.toContain(verboseDeprecationsNote());
-        expect(console.error).toHaveBeenCalledTimes(1);
-        expect(console.error.calls.argsFor(0)[0]).not.toContain(
+        expect(privateUnderTest.consoleError).toHaveBeenCalledTimes(1);
+        expect(privateUnderTest.consoleError.calls.argsFor(0)[0]).not.toContain(
           verboseDeprecationsNote()
         );
       });
@@ -305,9 +308,13 @@ describe('Deprecator', function() {
         message: jasmine.stringMatching(/^the message/),
         omitStackTrace: false
       });
-      expect(console.error).toHaveBeenCalledTimes(1);
-      expect(console.error.calls.argsFor(0)[0]).toContain('the message');
-      expect(console.error.calls.argsFor(0)[0]).toContain('DeprecatorSpec.js');
+      expect(privateUnderTest.consoleError).toHaveBeenCalledTimes(1);
+      expect(privateUnderTest.consoleError.calls.argsFor(0)[0]).toContain(
+        'the message'
+      );
+      expect(privateUnderTest.consoleError.calls.argsFor(0)[0]).toContain(
+        'DeprecatorSpec.js'
+      );
     }
 
     function testNoStackTrace(options) {

spec/core/baseSpec.js

@@ -152,7 +152,7 @@ describe('base helpers', function() {
       if (typeof process !== 'undefined' && process.emitWarning) {
         spyOn(process, 'emitWarning'); // Node 22
       }
-      spyOn(console, 'error'); // Node <22
+      spyOn(privateUnderTest, 'consoleError'); // Node <22
 
       let id = setTimeout(f1, max);
       setTimeout(function() {