big update to observe, template_binding, polymer

pkg/polymer_expressions/test/bindings_test.dart

Index: pkg/polymer_expressions/test/bindings_test.dart
diff --git a/pkg/polymer_expressions/test/bindings_test.dart b/pkg/polymer_expressions/test/bindings_test.dart
index 26a3a14cbb28837208354bd31406adca70798094..209012d17a3f84214202cfec555a8f0e548f9085 100644
--- a/pkg/polymer_expressions/test/bindings_test.dart
+++ b/pkg/polymer_expressions/test/bindings_test.dart
@@ -4,17 +4,18 @@
 
 library bindings_test;
 
+import 'dart:async';
 import 'dart:html';
 
 import 'package:logging/logging.dart';
 import 'package:observe/observe.dart';
-import 'package:observe/src/microtask.dart';
+import 'package:observe/src/dirty_check.dart' show dirtyCheckZone;
 import 'package:polymer_expressions/polymer_expressions.dart';
 import 'package:template_binding/template_binding.dart' show templateBind;
 import 'package:unittest/html_config.dart';
 import 'package:unittest/unittest.dart';
 
-main() {
+main() => dirtyCheckZone().run(() {
   useHtmlConfiguration();
 
   group('bindings', () {
@@ -34,89 +35,93 @@ main() {
       messages = [];
     });
 
-    observeTest('should update binding when data changes', () {
+    test('should update binding when data changes', () {
       var model = new NotifyModel();
       var binding = new PolymerExpressions()
-          .prepareBinding('x', null, null)(model, null);
+          .prepareBinding('x', null, null)(model, null, false);
       expect(binding.value, isNull);
       model.x = "hi";
-      performMicrotaskCheckpoint();
-      expect(binding.value, 'hi');
-      expect(messages.length, 0);
+      return new Future(() {
+        expect(binding.value, 'hi');
+        expect(messages.length, 0);
+      });
     });
 
-    observeTest('should update text content when data changes', () {
+    test('should update text content when data changes', () {
       var model = new NotifyModel('abcde');
       var template = templateBind(new Element.html(
           '<template><span>{{x}}</span></template>'));
       testDiv.append(template.createInstance(model, new PolymerExpressions()));
 
-      performMicrotaskCheckpoint();
-      var el = testDiv.query("span");
-      expect(el.text, 'abcde');
-      expect(model.x, 'abcde');
-      model.x = '___';
-
-      performMicrotaskCheckpoint();
-      expect(model.x, '___');
-      expect(el.text, '___');
+      return new Future(() {
+        var el = testDiv.query("span");
+        expect(el.text, 'abcde');
+        expect(model.x, 'abcde');
+        model.x = '___';
+
+        return new Future(() {
+          expect(model.x, '___');
+          expect(el.text, '___');
+        });
+      });
     });
 
-    observeTest('should log eval exceptions', () {
+    test('should log eval exceptions', () {
       var model = new NotifyModel('abcde');
       var template = templateBind(new Element.html(
           '<template><span>{{foo}}</span></template>'));
       testDiv.append(template.createInstance(model, new PolymerExpressions()));
-      performMicrotaskCheckpoint();
-      expect(messages.length, 1);
-      expect(messages[0].message,
-          "Error evaluating expression 'foo': variable 'foo' not found");
+
+      return new Future(() {
+        expect(messages.length, 1);
+        expect(messages[0].message,
+            "Error evaluating expression 'foo': variable 'foo' not found");
+      });
     });
 
-    observeTest('should preserve the cursor position', () {
+    test('should preserve the cursor position', () {
       var model = new NotifyModel('abcde');
       var template = templateBind(new Element.html(
           '<template><input id="i1" value={{x}}></template>'));
       testDiv.append(template.createInstance(model, new PolymerExpressions()));
 
-      performMicrotaskCheckpoint();
-      var el = testDiv.query("#i1");
-      var subscription = el.onInput.listen(expectAsync1((_) {
-        performMicrotaskCheckpoint();
-      }, count: 1));
-      el.focus();
-
-      expect(el.value, 'abcde');
-      expect(model.x, 'abcde');
-
-      el.selectionStart = 3;
-      el.selectionEnd = 3;
-      expect(el.selectionStart, 3);
-      expect(el.selectionEnd, 3);
-
-      el.value = 'abc de';
-      // Updating the input value programatically (even to the same value in
-      // Chrome) loses the selection position.
-      expect(el.selectionStart, 6);
-      expect(el.selectionEnd, 6);
-
-      el.selectionStart = 4;
-      el.selectionEnd = 4;
-
-      expect(model.x, 'abcde');
-      el.dispatchEvent(new Event('input'));
-      expect(model.x, 'abc de');
-      expect(el.value, 'abc de');
-
-      // But propagating observable values through reassign the value and
-      // selection will be preserved.
-      expect(el.selectionStart, 4);
-      expect(el.selectionEnd, 4);
-
-      subscription.cancel();
+      return new Future(() {
+        var el = testDiv.query("#i1");
+        var subscription = el.onInput.listen(expectAsync1((_) {}, count: 1));
+        el.focus();
+
+        expect(el.value, 'abcde');
+        expect(model.x, 'abcde');
+
+        el.selectionStart = 3;
+        el.selectionEnd = 3;
+        expect(el.selectionStart, 3);
+        expect(el.selectionEnd, 3);
+
+        el.value = 'abc de';
+        // Updating the input value programatically (even to the same value in
+        // Chrome) loses the selection position.
+        expect(el.selectionStart, 6);
+        expect(el.selectionEnd, 6);
+
+        el.selectionStart = 4;
+        el.selectionEnd = 4;
+
+        expect(model.x, 'abcde');
+        el.dispatchEvent(new Event('input'));
+        expect(model.x, 'abc de');
+        expect(el.value, 'abc de');
+
+        // But propagating observable values through reassign the value and
+        // selection will be preserved.
+        expect(el.selectionStart, 4);
+        expect(el.selectionEnd, 4);
+
+        subscription.cancel();
+      });
     });
   });
-}
+});
 
 @reflectable
 class NotifyModel extends ChangeNotifier {
@@ -128,5 +133,3 @@ class NotifyModel extends ChangeNotifier {
     _x = notifyPropertyChange(#x, _x, value);
   }
 }
-
-observeTest(name, testCase) => test(name, wrapMicrotask(testCase));