Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/pkg/angular/test/directive/ng_if_spec.dart

Issue 256553002: Revert "Update all Angular libs (run update_all.sh)." (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/pkg/angular/test/directive/ng_form_spec.dart ('k') | third_party/pkg/angular/test/directive/ng_include_spec.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/pkg/angular/test/directive/ng_if_spec.dart
diff --git a/third_party/pkg/angular/test/directive/ng_if_spec.dart b/third_party/pkg/angular/test/directive/ng_if_spec.dart
index b5251b261ed1515e2357d1179e29baca19190b09..ec2a92f51197db5644a36e2529c8df870410312c 100644
--- a/third_party/pkg/angular/test/directive/ng_if_spec.dart
+++ b/third_party/pkg/angular/test/directive/ng_if_spec.dart
@@ -2,43 +2,47 @@ library ng_if_spec;
import '../_specs.dart';
-@Decorator(
+@NgDirective(
selector: '[child-controller]',
- children: Directive.TRANSCLUDE_CHILDREN)
+ children: NgAnnotation.TRANSCLUDE_CHILDREN)
class ChildController {
- ChildController(BoundViewFactory boundViewFactory,
- ViewPort viewPort,
+ ChildController(BoundBlockFactory boundBlockFactory,
+ BlockHole blockHole,
Scope scope) {
scope.context['setBy'] = 'childController';
- viewPort.insert(boundViewFactory(scope));
+ boundBlockFactory(scope).insertAfter(blockHole);
}
}
main() {
var compile, html, element, rootScope, logger, directives;
- void configInjector(Module module) {
- module..type(ChildController)
+ void configInjector() {
+ module((Module module) {
+ module
+ ..type(ChildController)
..type(LogAttrDirective);
+ });
}
- void configState(Scope scope, Compiler compiler, Injector injector,
- Logger _logger, DirectiveMap _directives) {
- rootScope = scope;
- logger = _logger;
- compile = (html, [applyFn]) {
- element = e(html);
- compiler([element], _directives)(injector, [element]);
- scope.apply(applyFn);
- };
- directives = _directives;
+ void configState() {
+ inject((Scope scope, Compiler compiler, Injector injector, Logger _logger, DirectiveMap _directives) {
+ rootScope = scope;
+ logger = _logger;
+ compile = (html, [applyFn]) {
+ element = $(html);
+ compiler(element, _directives)(injector, element);
+ scope.apply(applyFn);
+ };
+ directives = _directives;
+ });
}
they(should, htmlForElements, callback, [exclusive=false]) {
htmlForElements.forEach((html) {
var directiveName = html.contains('ng-if') ? 'ng-if' : 'ng-unless';
describe(directiveName, () {
- beforeEachModule(configInjector);
+ beforeEach(configInjector);
beforeEach(configState);
(exclusive ? iit : it)(should, () {
callback(html);
@@ -53,20 +57,22 @@ main() {
(html) {
compile(html);
// The span node should NOT exist in the DOM.
- expect(element.querySelectorAll('span').length).toEqual(0);
+ expect(element.contents().length).toEqual(1);
+ expect(element.find('span').html()).toEqual('');
rootScope.apply(() {
rootScope.context['isVisible'] = true;
});
// The span node SHOULD exist in the DOM.
- expect(element.querySelector('span')).toHaveHtml('content');
+ expect(element.contents().length).toEqual(2);
+ expect(element.find('span').html()).toEqual('content');
rootScope.apply(() {
rootScope.context['isVisible'] = false;
});
- expect(element.querySelectorAll('span').length).toEqual(0);
+ expect(element.find('span').html()).toEqual('');
}
);
@@ -75,31 +81,31 @@ main() {
// ng-if
'<div>' +
' <div ng-if="isVisible">'.trim() +
- ' <span child-controller id="inside">inside {{setBy}};</span>'.trim() +
+ ' <span child-controller id="inside">{{setBy}}</span>'.trim() +
' </div>'.trim() +
- ' <span id="outside">outside {{setBy}}</span>'.trim() +
+ ' <span id="outside">{{setBy}}</span>'.trim() +
'</div>',
// ng-unless
'<div>' +
' <div ng-unless="!isVisible">'.trim() +
- ' <span child-controller id="inside">inside {{setBy}};</span>'.trim() +
+ ' <span child-controller id="inside">{{setBy}}</span>'.trim() +
' </div>'.trim() +
- ' <span id="outside">outside {{setBy}}</span>'.trim() +
+ ' <span id="outside">{{setBy}}</span>'.trim() +
'</div>'],
(html) {
rootScope.context['setBy'] = 'topLevel';
compile(html);
- expect(element).toHaveText('outside topLevel');
+ expect(element.contents().length).toEqual(2);
rootScope.apply(() {
rootScope.context['isVisible'] = true;
});
- expect(element).toHaveText('inside childController;outside topLevel');
+ expect(element.contents().length).toEqual(3);
// The value on the parent scope.context['should'] be unchanged.
expect(rootScope.context['setBy']).toEqual('topLevel');
- expect(element.querySelector('#outside')).toHaveHtml('outside topLevel');
+ expect(element.find('#outside').html()).toEqual('topLevel');
// A child scope.context['must'] have been created and hold a different value.
- expect(element.querySelector('#inside')).toHaveHtml('inside childController;');
+ expect(element.find('#inside').html()).toEqual('childController');
}
);
@@ -107,28 +113,28 @@ main() {
[
// ng-if
'<div>' +
- ' <div ng-repeat="i in values">repeat;</div>'.trim() +
- ' <div ng-if="values.length==4">if;</div>'.trim() +
- ' <div ng-repeat="i in values">repeat2;</div>'.trim() +
+ ' <div ng-repeat="i in values"></div>'.trim() +
+ ' <div ng-if="values.length==4"></div>'.trim() +
+ ' <div ng-repeat="i in values"></div>'.trim() +
'</div>',
// ng-unless
'<div>' +
- ' <div ng-repeat="i in values">repeat;</div>'.trim() +
- ' <div ng-unless="values.length!=4">if;</div>'.trim() +
- ' <div ng-repeat="i in values">repeat2;</div>'.trim() +
+ ' <div ng-repeat="i in values"></div>'.trim() +
+ ' <div ng-unless="values.length!=4"></div>'.trim() +
+ ' <div ng-repeat="i in values"></div>'.trim() +
'</div>'],
(html) {
var values = rootScope.context['values'] = [1, 2, 3, 4];
compile(html);
- expect(element).toHaveText('repeat;repeat;repeat;repeat;if;repeat2;repeat2;repeat2;repeat2;');
+ expect(element.contents().length).toBe(12);
rootScope.apply(() {
values.removeRange(0, 1);
});
- expect(element).toHaveText('repeat;repeat;repeat;repeat2;repeat2;repeat2;');
+ expect(element.contents().length).toBe(9);
rootScope.apply(() {
values.insert(0, 1);
});
- expect(element).toHaveText('repeat;repeat;repeat;repeat;if;repeat2;repeat2;repeat2;repeat2;');
+ expect(element.contents().length).toBe(12);
}
);
@@ -139,18 +145,18 @@ main() {
(html) {
rootScope.context['isVisible'] = true;
compile(html);
- expect(element).toHaveText('content');
- element.querySelector('span').classes.remove('my-class');
- expect(element.querySelector('span')).not.toHaveClass('my-class');
+ expect(element.contents().length).toEqual(2);
+ element.find('span').removeClass('my-class');
+ expect(element.find('span').hasClass('my-class')).not.toBe(true);
rootScope.apply(() {
rootScope.context['isVisible'] = false;
});
- expect(element).toHaveText('');
+ expect(element.contents().length).toEqual(1);
rootScope.apply(() {
rootScope.context['isVisible'] = true;
});
// The newly inserted node should be a copy of the compiled state.
- expect(element.querySelector('span')).toHaveClass('my-class');
+ expect(element.find('span').hasClass('my-class')).toBe(true);
}
);
@@ -163,7 +169,7 @@ main() {
rootScope.apply(() {
rootScope.context['isVisible'] = false;
});
- expect(element.querySelectorAll('span').length).toEqual(0);
+ expect(element.find('span').html()).toEqual('');
}
);
@@ -173,19 +179,19 @@ main() {
'<div><li log="ALWAYS"></li><span log="JAMES" ng-unless="!isVisible">content</span></div>'],
(html) {
compile(html);
- expect(element.querySelectorAll('span').length).toEqual(0);
+ expect(element.find('span').html()).toEqual('');
rootScope.apply(() {
rootScope.context['isVisible'] = false;
});
- expect(element.querySelectorAll('span').length).toEqual(0);
+ expect(element.find('span').html()).toEqual('');
expect(logger.result()).toEqual('ALWAYS');
rootScope.apply(() {
rootScope.context['isVisible'] = true;
});
- expect(element.querySelector('span')).toHaveHtml('content');
+ expect(element.find('span').html()).toEqual('content');
expect(logger.result()).toEqual('ALWAYS; JAMES');
}
);
@@ -196,7 +202,7 @@ main() {
'<div><div ng-unless="!a"><div ng-unless="!b">content</div></div></div>'],
(html) {
compile(html);
- expect(element.querySelectorAll('span').length).toEqual(0);
+ expect(element.find('span').html()).toEqual('');
expect(() {
rootScope.apply(() {
@@ -204,7 +210,7 @@ main() {
rootScope.context['b'] = false;
});
}).not.toThrow();
- expect(element.querySelectorAll('span').length).toEqual(0);
+ expect(element.find('span').html()).toEqual('');
expect(() {
@@ -213,7 +219,7 @@ main() {
rootScope.context['b'] = true;
});
}).not.toThrow();
- expect(element.querySelectorAll('span').length).toEqual(0);
+ expect(element.find('span').html()).toEqual('');
}
);
}
« no previous file with comments | « third_party/pkg/angular/test/directive/ng_form_spec.dart ('k') | third_party/pkg/angular/test/directive/ng_include_spec.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698