Merge branch 'improve_toBeRejectedWithError' of https://github.com/andiz2/jasmine

lib/jasmine-core/jasmine.js

@@ -4334,7 +4334,9 @@ getJasmineRequireObj().toBePending = function(j$) {
     return {
       compare: function(actual) {
         if (!j$.isPromiseLike(actual)) {
-          throw new Error('Expected toBePending to be called on a promise.');
+          throw new Error(
+            `Expected toBePending to be called on a promise but was on a ${typeof actual}.`
+          );
         }
         const want = {};
         return Promise.race([actual, Promise.resolve(want)]).then(
@@ -4366,7 +4368,9 @@ getJasmineRequireObj().toBeRejected = function(j$) {
     return {
       compare: function(actual) {
         if (!j$.isPromiseLike(actual)) {
-          throw new Error('Expected toBeRejected to be called on a promise.');
+          throw new Error(
+            `Expected toBeRejected to be called on a promise but was on a ${typeof actual}.`
+          );
         }
         return actual.then(
           function() {
@@ -4399,7 +4403,7 @@ getJasmineRequireObj().toBeRejectedWith = function(j$) {
       compare: function(actualPromise, expectedValue) {
         if (!j$.isPromiseLike(actualPromise)) {
           throw new Error(
-            'Expected toBeRejectedWith to be called on a promise.'
+            `Expected toBeRejectedWith to be called on a promise but was on a ${typeof actualPromise}.`
           );
         }
 
@@ -4463,7 +4467,7 @@ getJasmineRequireObj().toBeRejectedWithError = function(j$) {
       compare: function(actualPromise, arg1, arg2) {
         if (!j$.isPromiseLike(actualPromise)) {
           throw new Error(
-            'Expected toBeRejectedWithError to be called on a promise.'
+            `Expected toBeRejectedWithError to be called on a promise but was on a ${typeof actualPromise}.`
           );
         }
 
@@ -4581,7 +4585,9 @@ getJasmineRequireObj().toBeResolved = function(j$) {
     return {
       compare: function(actual) {
         if (!j$.isPromiseLike(actual)) {
-          throw new Error('Expected toBeResolved to be called on a promise.');
+          throw new Error(
+            `Expected toBeResolved to be called on a promise but was on a ${typeof actual}.`
+          );
         }
 
         return actual.then(
@@ -4621,7 +4627,9 @@ getJasmineRequireObj().toBeResolvedTo = function(j$) {
     return {
       compare: function(actualPromise, expectedValue) {
         if (!j$.isPromiseLike(actualPromise)) {
-          throw new Error('Expected toBeResolvedTo to be called on a promise.');
+          throw new Error(
+            `Expected toBeResolvedTo to be called on a promise but was on a ${typeof actualPromise}.`
+          );
         }
 
         function prefix(passed) {

spec/core/matchers/async/toBePendingSpec.js

@@ -38,6 +38,8 @@ describe('toBePending', function() {
       return matcher.compare(actual);
     }
 
-    expect(f).toThrowError('Expected toBePending to be called on a promise.');
+    expect(f).toThrowError(
+      `Expected toBePending to be called on a promise but was on a ${typeof actual}.`
+    );
   });
 });

spec/core/matchers/async/toBeRejectedSpec.js

@@ -28,6 +28,8 @@ describe('toBeRejected', function() {
       return matcher.compare(actual);
     }
 
-    expect(f).toThrowError('Expected toBeRejected to be called on a promise.');
+    expect(f).toThrowError(
+      `Expected toBeRejected to be called on a promise but was on a ${typeof actual}.`
+    );
   });
 });

spec/core/matchers/async/toBeRejectedWithErrorSpec.js

@@ -232,7 +232,7 @@ describe('#toBeRejectedWithError', function() {
     }
 
     expect(f).toThrowError(
-      'Expected toBeRejectedWithError to be called on a promise.'
+      `Expected toBeRejectedWithError to be called on a promise but was on a ${typeof actual}.`
     );
   });
 });

spec/core/matchers/async/toBeRejectedWithSpec.js

@@ -83,7 +83,7 @@ describe('#toBeRejectedWith', function() {
     }
 
     expect(f).toThrowError(
-      'Expected toBeRejectedWith to be called on a promise.'
+      `Expected toBeRejectedWith to be called on a promise but was on a ${typeof actual}.`
     );
   });
 });

spec/core/matchers/async/toBeResolvedSpec.js

@@ -35,6 +35,8 @@ describe('toBeResolved', function() {
       return matcher.compare(actual);
     }
 
-    expect(f).toThrowError('Expected toBeResolved to be called on a promise.');
+    expect(f).toThrowError(
+      `Expected toBeResolved to be called on a promise but was on a ${typeof actual}.`
+    );
   });
 });

spec/core/matchers/async/toBeResolvedToSpec.js

@@ -93,7 +93,7 @@ describe('#toBeResolvedTo', function() {
     }
 
     expect(f).toThrowError(
-      'Expected toBeResolvedTo to be called on a promise.'
+      `Expected toBeResolvedTo to be called on a promise but was on a ${typeof actual}.`
     );
   });
 });

src/core/matchers/async/toBePending.js

@@ -12,7 +12,9 @@ getJasmineRequireObj().toBePending = function(j$) {
     return {
       compare: function(actual) {
         if (!j$.isPromiseLike(actual)) {
-          throw new Error('Expected toBePending to be called on a promise.');
+          throw new Error(
+            `Expected toBePending to be called on a promise but was on a ${typeof actual}.`
+          );
         }
         const want = {};
         return Promise.race([actual, Promise.resolve(want)]).then(

src/core/matchers/async/toBeRejected.js

@@ -14,7 +14,9 @@ getJasmineRequireObj().toBeRejected = function(j$) {
     return {
       compare: function(actual) {
         if (!j$.isPromiseLike(actual)) {
-          throw new Error('Expected toBeRejected to be called on a promise.');
+          throw new Error(
+            `Expected toBeRejected to be called on a promise but was on a ${typeof actual}.`
+          );
         }
         return actual.then(
           function() {

src/core/matchers/async/toBeRejectedWith.js

@@ -16,7 +16,7 @@ getJasmineRequireObj().toBeRejectedWith = function(j$) {
       compare: function(actualPromise, expectedValue) {
         if (!j$.isPromiseLike(actualPromise)) {
           throw new Error(
-            'Expected toBeRejectedWith to be called on a promise.'
+            `Expected toBeRejectedWith to be called on a promise but was on a ${typeof actualPromise}.`
           );
         }
 

src/core/matchers/async/toBeRejectedWithError.js

@@ -19,7 +19,7 @@ getJasmineRequireObj().toBeRejectedWithError = function(j$) {
       compare: function(actualPromise, arg1, arg2) {
         if (!j$.isPromiseLike(actualPromise)) {
           throw new Error(
-            'Expected toBeRejectedWithError to be called on a promise.'
+            `Expected toBeRejectedWithError to be called on a promise but was on a ${typeof actualPromise}.`
           );
         }
 

src/core/matchers/async/toBeResolved.js

@@ -14,7 +14,9 @@ getJasmineRequireObj().toBeResolved = function(j$) {
     return {
       compare: function(actual) {
         if (!j$.isPromiseLike(actual)) {
-          throw new Error('Expected toBeResolved to be called on a promise.');
+          throw new Error(
+            `Expected toBeResolved to be called on a promise but was on a ${typeof actual}.`
+          );
         }
 
         return actual.then(

src/core/matchers/async/toBeResolvedTo.js

@@ -15,7 +15,9 @@ getJasmineRequireObj().toBeResolvedTo = function(j$) {
     return {
       compare: function(actualPromise, expectedValue) {
         if (!j$.isPromiseLike(actualPromise)) {
-          throw new Error('Expected toBeResolvedTo to be called on a promise.');
+          throw new Error(
+            `Expected toBeResolvedTo to be called on a promise but was on a ${typeof actualPromise}.`
+          );
         }
 
         function prefix(passed) {