feat(expect): Move JQuery.text to Expect.toHaveText() and element.text

For #219

Author: jbdeboer

test/_specs.dart

@@ -51,6 +51,7 @@ class Expect {
   toBeNotNull() => unit.expect(actual, unit.isNotNull);
 
   toHaveHtml(expected) => unit.expect(_toHtml(actual), unit.equals(expected));
+  toHaveText(expected) => unit.expect(_elementText(actual), unit.equals(expected));
 
   toHaveBeenCalled() => unit.expect(actual.called, true, reason: 'method not called');
   toHaveBeenCalledOnce() => unit.expect(actual.count, 1, reason: 'method invoked ${actual.count} expected once');
@@ -117,6 +118,14 @@ class Expect {
     }
   }
 
+  _elementText(node) {
+    if (node is List) {
+      var acc = '';
+      node.forEach((n) { acc += _elementText(n); });
+      return acc;
+    }
+    return node.text;
+  }
 }
 
 class NotExpect {
@@ -222,7 +231,6 @@ class JQuery extends DelegatingList<Node> {
           (n, v) => n.setInnerHtml(v, treeSanitizer: new NullTreeSanitizer()),
           html);
   val([String text]) => accessor((n) => n.value, (n, v) => n.value = v);
-  text([String text]) => accessor((n) => n.text, (n, v) => n.text = v, text);
   contents() => fold(new JQuery(), (jq, node) => jq..addAll(node.nodes));
   eq(num childIndex) => $(this[childIndex]);
   remove(_) => forEach((n) => n.remove());

test/_specs_spec.dart

@@ -22,7 +22,7 @@ main() {
       it('should return the shadowRoot if one exists', () {
         var elts = $('<div></div>');
         elts[0].createShadowRoot().innerHtml = "Hello shadow";
-        expect(elts.shadowRoot().text()).toEqual("Hello shadow");
+        expect(elts.shadowRoot()[0].text).toEqual("Hello shadow");
       });
 
       it('should return empty list if there is no shadowRoot', () {

test/core_dom/compiler_spec.dart

@@ -45,13 +45,13 @@ void main() {
     beforeEach(inject((TestBed tb) => _ = tb));
 
     it('should compile basic hello world', () {
-      var element = $(_.compile('<div ng-bind="name"></div>'));
+      var element = _.compile('<div ng-bind="name"></div>');
 
       _.rootScope.context['name'] = 'angular';
 
-      expect(element.text()).toEqual('');
+      expect(element.text).toEqual('');
       _.rootScope.apply();
-      expect(element.text()).toEqual('angular');
+      expect(element.text).toEqual('angular');
     });
 
     it('should not throw on an empty list', () {
@@ -69,13 +69,13 @@ void main() {
     });
 
     it('should compile a directive in a child', () {
-      var element = $(_.compile('<div><div ng-bind="name"></div></div>'));
+      var element = _.compile('<div><div ng-bind="name"></div></div>');
 
       _.rootScope.context['name'] = 'angular';
 
-      expect(element.text()).toEqual('');
+      expect(element.text).toEqual('');
       _.rootScope.apply();
-      expect(element.text()).toEqual('angular');
+      expect(element.text).toEqual('angular');
     });
 
     it('should compile repeater', () {
@@ -93,12 +93,12 @@ void main() {
     });
 
     it('should compile a text child of a basic repeater', () {
-      var element = $(_.compile(
+      var element = _.compile(
                 '<div ng-show="true">' +
                   '<span ng-repeat="r in [1, 2]">{{r}}</span>' +
-                '</div>'));
+                '</div>');
       _.rootScope.apply();
-      expect(element.text()).toEqual('12');
+      expect(element.text).toEqual('12');
     });
 
     it('should compile a text child of a repeat with a directive', () {
@@ -109,14 +109,14 @@ void main() {
     });
 
     it('should compile a sibling template directive', () {
-      var element = $(_.compile(
+      var element = _.compile(
         '<div ng-model="selected">'
           '<option value="">blank</option>'
           '<div ng-repeat="value in [1,2]" ng-value="value">{{value}}</div>'
-      '</div>'));
+      '</div>');
 
       _.rootScope.apply();
-      expect(element.text()).toEqual('blank12');
+      expect(element.text).toEqual('blank12');
     });
 
     it('should compile repeater with children', (Compiler $compile) {
@@ -134,26 +134,26 @@ void main() {
     });
 
     it('should compile text', (Compiler $compile) {
-      var element = $(_.compile('<div>{{name}}<span>!</span></div>'));
+      var element = _.compile('<div>{{name}}<span>!</span></div>');
       _.rootScope.context['name'] = 'OK';
 
       microLeap();
       _.rootScope.apply();
-      expect(element.text()).toEqual('OK!');
+      expect(element.text).toEqual('OK!');
     });
 
     it('should compile nested repeater', (Compiler $compile) {
-      var element = $(_.compile(
+      var element = _.compile(
           '<div>' +
           '<ul ng-repeat="lis in uls">' +
           '<li ng-repeat="li in lis">{{li}}</li>' +
           '</ul>' +
-          '</div>'));
+          '</div>');
 
       _.rootScope.context['uls'] = [['A'], ['b']];
 
       _.rootScope.apply();
-      expect(element.text()).toEqual('Ab');
+      expect(element.text).toEqual('Ab');
     });
 
     it('should compile two directives with the same selector', (Logger log) {
@@ -189,12 +189,12 @@ void main() {
       });
 
       it('should interpolate text nodes', () {
-        var element = $(_.compile('<div>{{name}}</div>'));
+        var element = _.compile('<div>{{name}}</div>');
 
         _.rootScope.context['name'] = 'angular';
 
         _.rootScope.apply();
-        expect(element.text()).toEqual('angular');
+        expect(element.text).toEqual('angular');
       });
     });
 
@@ -445,11 +445,11 @@ void main() {
       }));
 
       it('should publish directive controller into the scope', async((NgZone zone) {
-        var element = $(_.compile(r'<div><div publish-me>{{ctrlName.value}}</div></div>'));
+        var element = _.compile(r'<div><div publish-me>{{ctrlName.value}}</div></div>');
 
         microLeap();
         _.rootScope.apply();
-        expect(element.text()).toEqual('WORKED');
+        expect(element.text).toEqual('WORKED');
       }));
 
       it('should "publish" controller to injector under provided publishTypes', () {

test/core_dom/ng_mustache_spec.dart

@@ -12,16 +12,16 @@ main() {
     beforeEach(inject((TestBed tb) => _ = tb));
 
     it('should replace {{}} in text', inject((Compiler $compile, Scope rootScope, Injector injector, DirectiveMap directives) {
-      var element = $('<div>{{name}}<span>!</span></div>');
+      var element = es('<div>{{name}}<span>!</span></div>');
       var template = $compile(element, directives);
 
       rootScope.context['name'] = 'OK';
       var view = template(injector);
 
-      element = $(view.nodes);
+      element = view.nodes;
 
       rootScope.apply();
-      expect(element.text()).toEqual('OK!');
+      expect(element).toHaveText('OK!');
     }));
 
     describe('observe/flush phase', () {

test/core_dom/view_spec.dart

@@ -113,7 +113,7 @@ main() {
           anchor.insert(a);
           anchor.insert(b, insertAfter: a);
 
-          expect($rootElement.text()).toEqual('AaBb');
+          expect($rootElement[0].text).toEqual('AaBb');
         });
 
         it('should remove the last view', () {
@@ -163,11 +163,11 @@ main() {
           // view after the <!--start--> element.
           outerAnchor.insert(outterBoundViewFactory(null));
 
-          expect($rootElement.text()).toEqual('text');
+          expect($rootElement[0].text).toEqual('text');
 
           anchor.remove(outerView);
 
-          expect($rootElement.text()).toEqual('');
+          expect($rootElement[0].text).toEqual('');
         });
       });
 
@@ -177,7 +177,7 @@ main() {
           anchor.insert(a);
           anchor.insert(b, insertAfter: a);
 
-          expect($rootElement.text()).toEqual('AaBb');
+          expect($rootElement[0].text).toEqual('AaBb');
         });
 
 

test/directive/ng_bind_spec.dart

@@ -9,11 +9,11 @@ main() {
     beforeEach((TestBed tb) => _ = tb);
 
     it('should set.text', (Scope scope, Injector injector, Compiler compiler, DirectiveMap directives) {
-      var element = $('<div ng-bind="a"></div>');
-      compiler(element, directives)(injector, element);
+      var element = e('<div ng-bind="a"></div>');
+      compiler([element], directives)(injector, [element]);
       scope.context['a'] = "abc123";
       scope.apply();
-      expect(element.text()).toEqual('abc123');
+      expect(element.text).toEqual('abc123');
     });
 
 

test/directive/ng_non_bindable_spec.dart

@@ -10,7 +10,7 @@ main() {
 
     it('should set ignore all other markup/directives on the descendent nodes',
           (Scope scope, Injector injector, Compiler compiler, DirectiveMap directives) {
-      var element = $('<div>' +
+      Element element = e('<div>' +
                       '  <span id="s1">{{a}}</span>' +
                       '  <span id="s2" ng-bind="b"></span>' +
                       '  <div foo="{{a}}" ng-non-bindable>' +
@@ -19,21 +19,21 @@ main() {
                       '  <span id="s3">{{a}}</span>' +
                       '  <span id="s4" ng-bind="b"></span>' +
                       '</div>');
-      compiler(element, directives)(injector, element);
+      compiler([element], directives)(injector, [element]);
       scope.context['a'] = "one";
       scope.context['b'] = "two";
       scope.apply();
       // Bindings not contained by ng-non-bindable should resolve.
-      expect(element.find("#s1").text().trim()).toEqual('one');
-      expect(element.find("#s2").text().trim()).toEqual('two');
-      expect(element.find("#s3").text().trim()).toEqual('one');
-      expect(element.find("#s4").text().trim()).toEqual('two');
+      expect(element.querySelector("#s1").text.trim()).toEqual('one');
+      expect(element.querySelector("#s2").text.trim()).toEqual('two');
+      expect(element.querySelector("#s3").text.trim()).toEqual('one');
+      expect(element.querySelector("#s4").text.trim()).toEqual('two');
       // Bindings contained by ng-non-bindable should be left alone.
-      var nonBindableDiv = element.find("div");
-      expect(nonBindableDiv[0]).toHaveHtml('<span ng-bind="a"></span>{{b}}');
-      expect(nonBindableDiv.text().trim()).toEqual('{{b}}');
+      var nonBindableDiv = element.querySelector("div");
+      expect(nonBindableDiv).toHaveHtml('<span ng-bind="a"></span>{{b}}');
+      expect(nonBindableDiv.text.trim()).toEqual('{{b}}');
       // Bindings on the same node are processed.
-      expect(nonBindableDiv.attr('foo')).toEqual('one');
+      expect(nonBindableDiv.attributes['foo']).toEqual('one');
     });
   });
 }