[Bugfix] object to string

Issue found in: https://travis-ci.org/emberjs/ember-inspector/jobs/364445291
emberjs · Apr 15, 2018 · 36b49d8 · 36b49d8
1 parent 3c26399
commit 36b49d8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/packages/ember-metal/lib/namespace_search.js b/packages/ember-metal/lib/namespace_search.js
@@ -185,7 +185,7 @@ function calculateToString(target) {
     let superclass = target;
     do {
       superclass = Object.getPrototypeOf(superclass);
-      if (superclass === Function.prototype) {
+      if (superclass === Function.prototype || superclass === Object.prototype) {
         break;
       }
       str = getName(target);

diff --git a/packages/ember-metal/tests/namespace_search_test.js b/packages/ember-metal/tests/namespace_search_test.js
@@ -0,0 +1,16 @@
+import { Mixin } from '..';
+import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+
+moduleFor(
+  'NamespaceSearch',
+  class extends AbstractTestCase {
+    ['@test classToString: null as this inside class must not throw error'](assert) {
+      let mixin = Mixin.create();
+      assert.equal(
+        mixin.toString(),
+        '(unknown)',
+        'this = null should be handled on Mixin.toString() call'
+      );
+    }
+  }
+);