Merge branch 'master' of https://github.com/mmmichl/jasmine into mmmichl-master

- Merges #1283 from @mmmichl
2017-03-14 17:47:02 -07:00
parent 5533d1a920 8807bbb850
commit a37b6c0d32
3 changed files with 26 additions and 2 deletions
--- a/src/core/Env.js
+++ b/src/core/Env.js
@@ -523,7 +523,14 @@ getJasmineRequireObj().Env = function(j$) {
      var message = 'Failed';
      if (error) {
        message += ': ';
-        message += error.message || error;
+        if (error.message) {
+          message += error.message;
+        } else if (jasmine.isString_(error)) {
+          message += error;
+        } else {
+          // pretty print all kind of objects. This includes arrays.
+          message += jasmine.pp(error);
+        }
      }

      currentRunnable().addExpectationResult(false, {