fix(hasDeclaredDependencies): handle deps already converted to Comput…

…edExpression fixes #359
aurelia · Mar 25, 2016 · 7160248 · 7160248
1 parent 76c1008
commit 7160248
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/computed-observation.js b/src/computed-observation.js
@@ -3,7 +3,7 @@ import {createOverrideContext} from './scope';
 import {ExpressionObserver} from './expression-observer';
 
 export function hasDeclaredDependencies(descriptor) {
-  return descriptor && descriptor.get && descriptor.get.dependencies && descriptor.get.dependencies.length > 0;
+  return !!(descriptor && descriptor.get && descriptor.get.dependencies);
 }
 
 export function declarePropertyDependencies(ctor, propertyName, dependencies) {

diff --git a/test/computed-observation.spec.js b/test/computed-observation.spec.js
@@ -1,5 +1,9 @@
 import './setup';
-import {declarePropertyDependencies, computedFrom} from '../src/computed-observation';
+import {
+  declarePropertyDependencies,
+  computedFrom,
+  hasDeclaredDependencies
+} from '../src/computed-observation';
 import {ExpressionObserver} from '../src/expression-observer';
 import {createObserverLocator, Person, Foo} from './shared';
 
@@ -20,6 +24,7 @@ describe('declarePropertyDependencies', () => {
     declarePropertyDependencies(Person, 'fullName', dependencies);
     expect(Object.getOwnPropertyDescriptor(person.constructor.prototype, 'fullName').get.dependencies)
       .toBe(dependencies);
+    expect(hasDeclaredDependencies(Object.getPropertyDescriptor(person, 'fullName'))).toBe(true);
   });
 
   it('should declare dependencies for properties with a setter', () => {
@@ -75,6 +80,10 @@ describe('createComputedObserver', () => {
     observer = locator.getObserver(person, 'fullName');
   });
 
+  it('should have declared dependencies after observer is created', () => {
+    expect(hasDeclaredDependencies(Object.getPropertyDescriptor(person, 'fullName'))).toBe(true);
+  });
+
   it('should be an ExpressionObserver', () => {
     expect(observer instanceof ExpressionObserver).toBe(true);
   });