Merge pull request #10991 from mitchlloyd/view-computed-controller

Fix a test for view controller property
emberjs · May 1, 2015 · 5725b5c · 5725b5c
2 parents 3ba81e3 + ce28b3c
commit 5725b5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/ember-views/lib/mixins/view_context_support.js b/packages/ember-views/lib/mixins/view_context_support.js
@@ -8,6 +8,7 @@ import { get } from "ember-metal/property_get";
 import { set } from "ember-metal/property_set";
 import LegacyViewSupport from "ember-views/mixins/legacy_view_support";
 import { observer } from "ember-metal/mixin";
+import { on } from "ember-metal/events";
 
 var ViewContextSupport = Mixin.create(LegacyViewSupport, {
   /**
@@ -94,6 +95,10 @@ var ViewContextSupport = Mixin.create(LegacyViewSupport, {
 
   _legacyControllerDidChange: observer('controller', function() {
     this.walkChildViews(view => view.notifyPropertyChange('controller'));
+  }),
+
+  _notifyControllerChange: on('parentViewDidChange', function() {
+    this.notifyPropertyChange('controller');
   })
 });
 

diff --git a/packages/ember-views/tests/views/view/controller_test.js b/packages/ember-views/tests/views/view/controller_test.js
@@ -4,7 +4,7 @@ import ContainerView from "ember-views/views/container_view";
 
 QUnit.module("Ember.View - controller property");
 
-QUnit.skip("controller property should be inherited from nearest ancestor with controller", function() {
+QUnit.test("controller property should be inherited from nearest ancestor with controller", function() {
   var grandparent = ContainerView.create();
   var parent = ContainerView.create();
   var child = ContainerView.create();