Merge pull request #16750 from ampatspell/is-object-guard-for-is-proxy

[BUGFIX release] bring back isObject guard for ember-utils/is_proxy
emberjs · Jun 15, 2018 · 396424c · 396424c
2 parents 9ba382d + 6346e82
commit 396424c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/packages/ember-utils/lib/is_proxy.ts b/packages/ember-utils/lib/is_proxy.ts
@@ -4,7 +4,10 @@ import WeakSet from './weak_set';
 const PROXIES = new WeakSet();
 
 export function isProxy(object: any | undefined | null) {
-  return PROXIES.has(object);
+  if (isObject(object)) {
+    return PROXIES.has(object);
+  }
+  return false;
 }
 
 export function setProxy(object: object) {

diff --git a/packages/ember-utils/tests/is_proxy_test.js b/packages/ember-utils/tests/is_proxy_test.js
@@ -0,0 +1,18 @@
+import { isProxy, setProxy } from '..';
+import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+
+moduleFor(
+  'ember-utils isProxy',
+  class extends AbstractTestCase {
+    ['@test basic'](assert) {
+      let proxy = {};
+      setProxy(proxy);
+
+      assert.equal(isProxy(proxy), true);
+
+      assert.equal(isProxy({}), false);
+      assert.equal(isProxy(undefined), false);
+      assert.equal(isProxy(null), false);
+    }
+  }
+);