merge to trunk all changes from 36817 until 37378 under the packages: polymer,

pkg/template_binding/test/custom_element_bindings_test.dart

Index: pkg/template_binding/test/custom_element_bindings_test.dart
===================================================================
--- pkg/template_binding/test/custom_element_bindings_test.dart	(revision 37373)
+++ pkg/template_binding/test/custom_element_bindings_test.dart	(working copy)
@@ -20,8 +20,9 @@
   useHtmlConfiguration();
 
   _registered = customElementsReady.then((_) {
-    document.register('my-custom-element', MyCustomElement);
-    document.register('with-attrs-custom-element', WithAttrsCustomElement);
+    document.registerElement('my-custom-element', MyCustomElement);
+    document.registerElement('with-attrs-custom-element',
+        WithAttrsCustomElement);
   });
 
   group('Custom Element Bindings', customElementBindingsTest);
@@ -38,14 +39,16 @@
     testDiv = null;
   });
 
-  test('override bind/unbind/unbindAll', () {
+  test('override bind/bindFinished', () {
     var element = new MyCustomElement();
     var model = toObservable({'a': new Point(123, 444), 'b': new Monster(100)});
 
-    nodeBind(element)
-        ..bind('my-point', new PathObserver(model, 'a'))
-        ..bind('scary-monster', new PathObserver(model, 'b'));
+    var pointBinding = nodeBind(element)
+        .bind('my-point', new PathObserver(model, 'a'));
 
+    var scaryBinding = nodeBind(element)
+        .bind('scary-monster', new PathObserver(model, 'b'));
+
     expect(element.attributes, isNot(contains('my-point')));
     expect(element.attributes, isNot(contains('scary-monster')));
 
@@ -55,7 +58,8 @@
     model['a'] = null;
     return new Future(() {
       expect(element.myPoint, null);
-      nodeBind(element).unbind('my-point');
+      expect(element.bindFinishedCalled, 0);
+      pointBinding.close();
 
       model['a'] = new Point(1, 2);
       model['b'] = new Monster(200);
@@ -63,10 +67,11 @@
       expect(element.scaryMonster, model['b']);
       expect(element.myPoint, null, reason: 'a was unbound');
 
-      nodeBind(element).unbindAll();
+      scaryBinding.close();
       model['b'] = null;
     }).then(endOfMicrotask).then((_) {
       expect(element.scaryMonster.health, 200);
+      expect(element.bindFinishedCalled, 0);
     });
   });
 
@@ -124,7 +129,6 @@
     templateBind(div.query('template')).model = model;
     var element;
     return new Future(() {
-      print('!!! running future');
       element = div.nodes[1];
 
       expect(element is MyCustomElement, true,
@@ -136,21 +140,29 @@
       expect(element.attributes, isNot(contains('my-point')));
       expect(element.attributes, isNot(contains('scary-monster')));
 
+      expect(element.bindFinishedCalled, 1);
+
       model['a'] = null;
     }).then(endOfMicrotask).then((_) {
       expect(element.myPoint, null);
+      expect(element.bindFinishedCalled, 1);
 
+
       templateBind(div.query('template')).model = null;
     }).then(endOfMicrotask).then((_) {
+      // Note: the detached element
+      expect(element.parentNode is DocumentFragment, true,
+          reason: 'removed element is added back to its document fragment');
+      expect(element.parentNode.parentNode, null,
+          reason: 'document fragment is detached');
+      expect(element.bindFinishedCalled, 1);
 
-      expect(element.parentNode, null, reason: 'element was detached');
-
       model['a'] = new Point(1, 2);
       model['b'] = new Monster(200);
     }).then(endOfMicrotask).then((_) {
-
       expect(element.myPoint, null, reason: 'model was unbound');
       expect(element.scaryMonster.health, 100, reason: 'model was unbound');
+      expect(element.bindFinishedCalled, 1);
     });
   });
 
@@ -161,10 +173,11 @@
   Monster(this.health);
 }
 
-/** Demonstrates a custom element overriding bind/unbind/unbindAll. */
+/** Demonstrates a custom element overriding bind/bindFinished. */
 class MyCustomElement extends HtmlElement implements NodeBindExtension {
   Point myPoint;
   Monster scaryMonster;
+  int bindFinishedCalled = 0;
 
   factory MyCustomElement() => new Element.tag('my-custom-element');
 
@@ -179,16 +192,23 @@
           _setProperty(name, value);
           return null;
         }
-        unbind(name);
         _setProperty(name, value.open((x) => _setProperty(name, x)));
+
+        if (!enableBindingsReflection) return value;
+        if (bindings == null) bindings = {};
+        var old = bindings[name];
+        if (old != null) old.close();
         return bindings[name] = value;
     }
     return nodeBindFallback(this).bind(name, value, oneTime: oneTime);
   }
 
-  unbind(name) => nodeBindFallback(this).unbind(name);
-  unbindAll() => nodeBindFallback(this).unbindAll();
+  void bindFinished() {
+    bindFinishedCalled++;
+  }
+
   get bindings => nodeBindFallback(this).bindings;
+  set bindings(x) => nodeBindFallback(this).bindings = x;
   get templateInstance => nodeBindFallback(this).templateInstance;
 
   void _setProperty(String property, newValue) {
@@ -228,6 +248,6 @@
 
   V remove(Object key) {
     log.add(['remove', key]);
-    super.remove(key);
+    return super.remove(key);
   }
 }