[BUGFIX beta] ember-routing: Always inherit model from parent

emberjs · Sep 20, 2014 · 3c0ac3d · 3c0ac3d
1 parent 3260c94
commit 3c0ac3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/ember-routing/lib/system/route.js b/packages/ember-routing/lib/system/route.js
@@ -1252,7 +1252,7 @@ var Route = EmberObject.extend(ActionHandler, {
 
     if (!name && sawParams) { return copy(params); }
     else if (!name) {
-      if (transition.resolveIndex !== transition.state.handlerInfos.length-1) { return; }
+      if (transition.resolveIndex < 1) { return; }
 
       var parentModel = transition.state.handlerInfos[transition.resolveIndex-1].context;
 

diff --git a/packages/ember/tests/routing/basic_test.js b/packages/ember/tests/routing/basic_test.js
@@ -1624,7 +1624,7 @@ test("Route inherits model from parent route", function() {
   handleURL("/posts/3/shares/3");
 });
 
-test("Resource does not inherit model from parent resource", function() {
+test("Resource inherits model from parent resource", function() {
   expect(6);
 
   Router.map(function() {
@@ -1652,7 +1652,7 @@ test("Resource does not inherit model from parent resource", function() {
     afterModel: function(post, transition) {
       var parent_model = this.modelFor('thePost');
 
-      notEqual(post, parent_model);
+      equal(post, parent_model);
     }
   });