failing test for reading a property off of a function

emberjs · Jul 19, 2017 · 49fb515 · 49fb515
1 parent af58855
commit 49fb515
Show file tree

Hide file tree

Showing 5 changed files with 153 additions and 46 deletions.
diff --git a/packages/ember-glimmer/tests/integration/content-test.js b/packages/ember-glimmer/tests/integration/content-test.js
@@ -484,6 +484,30 @@ class DynamicContentTest extends RenderingTest {
     this.assertContent('hello');
     this.assertInvariants();
   }
+
+  ['@test it can render a property on a function']() {
+    let func = () => {};
+    func.aProp = 'this is a property on a function';
+
+    this.renderPath('func.aProp', { func });
+
+    this.assertContent('this is a property on a function');
+
+    this.assertStableRerender();
+
+    this.runTask(() => set(func, 'aProp', 'still a property on a function'));
+
+    this.assertContent('still a property on a function');
+    this.assertInvariants();
+
+    func = () => {};
+    func.aProp = 'a prop on a new function';
+
+    this.runTask(() => set(this.context, 'func', func));
+
+    this.assertContent('a prop on a new function');
+    this.assertInvariants();
+  }
 }
 
 const EMPTY = {};

diff --git a/packages/ember-metal/lib/watch_key.js b/packages/ember-metal/lib/watch_key.js
@@ -14,7 +14,7 @@ import {
 let handleMandatorySetter;
 
 export function watchKey(obj, keyName, meta) {
-  if (typeof obj !== 'object' && typeof obj !== 'function' || obj === null) { return; }
+  if (typeof obj !== 'object' || obj === null) { return; }
 
   let m = meta || metaFor(obj);
   let count = m.peekWatching(keyName) || 0;
@@ -81,7 +81,7 @@ if (MANDATORY_SETTER) {
 }
 
 export function unwatchKey(obj, keyName, _meta) {
-  if (typeof obj !== 'object' && typeof obj !== 'function' || obj === null) { return; }
+  if (typeof obj !== 'object' || obj === null) { return; }
 
   let meta = _meta || peekMeta(obj);
 

diff --git a/packages/ember-metal/lib/watch_path.js b/packages/ember-metal/lib/watch_path.js
@@ -10,7 +10,7 @@ export function makeChainNode(obj) {
 }
 
 export function watchPath(obj, keyPath, meta) {
-  if (typeof obj !== 'object' && typeof obj !== 'function' || obj === null) { return; }
+  if (typeof obj !== 'object' || obj === null) { return; }
   let m = meta || metaFor(obj);
   let counter = m.peekWatching(keyPath) || 0;
 
@@ -21,7 +21,7 @@ export function watchPath(obj, keyPath, meta) {
 }
 
 export function unwatchPath(obj, keyPath, meta) {
-  if (typeof obj !== 'object' && typeof obj !== 'function' || obj === null) { return; }
+  if (typeof obj !== 'object' || obj === null) { return; }
   let m = meta || peekMeta(obj);
   if (m === undefined) { return; }
   let counter = m.peekWatching(keyPath) || 0;

diff --git a/packages/ember-metal/lib/watching.js b/packages/ember-metal/lib/watching.js
@@ -40,7 +40,7 @@ export function watch(obj, _keyPath, m) {
 }
 
 export function isWatching(obj, key) {
-  if (typeof obj !== 'object' && typeof obj !== 'function' || obj === null) {
+  if (typeof obj !== 'object' || obj === null) {
     return false;
   }
   let meta = peekMeta(obj);