Merge pull request #11685 from stefanpenner/component-cleanup

make linkChild idempotent

Author: rwjblue

.travis.yml

@@ -14,6 +14,7 @@ before_install:
   - "npm config set spin false"
   - "npm install -g npm@^2"
   - "npm --version"
+  - "phantomjs --version"
 
 install:
   - "npm install"

packages/ember-views/lib/mixins/view_child_views_support.js

@@ -10,7 +10,7 @@ import setProperties from 'ember-metal/set_properties';
 
 var EMPTY_ARRAY = [];
 
-var ViewChildViewsSupport = Mixin.create({
+export default Mixin.create({
   /**
     Array of child views. You should never edit this array directly.
     Instead, use `appendChild` and `removeFromParent`.
@@ -90,6 +90,8 @@ var ViewChildViewsSupport = Mixin.create({
 
     var attrs = _attrs || {};
     var view;
+
+    attrs.parentView = this;
     attrs.renderer = this.renderer;
     attrs._viewRegistry = this._viewRegistry;
 
@@ -123,8 +125,11 @@ var ViewChildViewsSupport = Mixin.create({
 
   linkChild(instance) {
     instance.container = this.container;
-    set(instance, 'parentView', this);
-    instance.trigger('parentViewDidChange');
+    if (get(instance, 'parentView') !== this) {
+      // linkChild should be idempotentj
+      set(instance, 'parentView', this);
+      instance.trigger('parentViewDidChange');
+    }
     instance.ownerView = this.ownerView;
   },
 
@@ -133,5 +138,3 @@ var ViewChildViewsSupport = Mixin.create({
     instance.trigger('parentViewDidChange');
   }
 });
-
-export default ViewChildViewsSupport;

packages/ember-views/tests/views/view/create_child_view_test.js

@@ -1,6 +1,8 @@
 import { get } from 'ember-metal/property_get';
 import run from 'ember-metal/run_loop';
 import EmberView from 'ember-views/views/view';
+import { on } from 'ember-metal/events';
+import { observer } from 'ember-metal/mixin';
 
 var view, myViewClass, newView, container;
 
@@ -33,7 +35,28 @@ QUnit.test('should create view from class with any passed attributes', function(
   equal(newView.container, container, 'expects to share container with parent');
   ok(get(newView, 'isMyView'), 'newView is instance of myView');
   equal(get(newView, 'foo'), 'baz', 'view did get custom attributes');
-  ok(!attrs.parentView, 'the original attributes hash was not mutated');
+});
+
+QUnit.test('creating a childView, (via createChildView) should make parentView initial state and not emit change events nore helper actions', function() {
+  expect(2);
+
+  newView = view.createChildView(EmberView.extend({
+    init() {
+      this._super(...arguments);
+      ok(true, 'did init');
+    },
+    parentViewDidReallyChange: on('parentViewDidChange', function() {
+      ok(false, 'expected to NOT emit parentViewDidChange');
+    }),
+    controllerDidChange: observer('controller', function() {
+      ok(false, 'expected to NOT expect controller to change');
+    }),
+    parentViewDidChange: observer('parentView', function() {
+      ok(false, 'expected to NOT expect  parentViewto change');
+    })
+  }));
+
+  equal(newView.get('parentView'), view, 'expected the correct parentView');
 });
 
 QUnit.test('should set newView.parentView to receiver', function() {