diff --git a/pubspec.lock b/pubspec.lock index e6b53e1ee..6a988dbea 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -71,7 +71,7 @@ packages: route_hierarchical: description: route_hierarchical source: hosted - version: "0.4.15" + version: "0.4.18" shadow_dom: description: shadow_dom source: hosted diff --git a/pubspec.yaml b/pubspec.yaml index 714195259..4455a5714 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: html5lib: '>=0.9.2 <0.10.0' intl: '>=0.8.7 <0.10.0' perf_api: '>=0.0.8 <0.1.0' - route_hierarchical: '>=0.4.7 <0.5.0' + route_hierarchical: '>=0.4.18 <0.5.0' shadow_dom: '>=0.9.1 <1.0.0' dev_dependencies: benchmark_harness: '>=1.0.0' diff --git a/test/routing/ng_view_spec.dart b/test/routing/ng_view_spec.dart index 35a057766..896ce2cbf 100644 --- a/test/routing/ng_view_spec.dart +++ b/test/routing/ng_view_spec.dart @@ -101,33 +101,28 @@ main() { '

Read Book 1234

')); }); - // This test is disable on dart2js because it is flaky - // on dart v1.2. Kasper is looking into it. In the - // meantime we are disabling it. - if (!identical(1, 1.0)) { - it('should switch nested templates', async(() { - Element root = _.compile(''); - expect(root.text).toEqual(''); - - router.route('/library/all'); - microLeap(); - expect(root.text).toEqual('LibraryBooks'); - - router.route('/library/1234'); - microLeap(); - expect(root.text).toEqual('LibraryBook 1234'); - - // nothing should change here - router.route('/library/1234/overview'); - microLeap(); - expect(root.text).toEqual('LibraryBook 1234'); - - // nothing should change here - router.route('/library/1234/read'); - microLeap(); - expect(root.text).toEqual('LibraryRead Book 1234'); - })); - } + it('should switch nested templates', async(() { + Element root = _.compile(''); + expect(root.text).toEqual(''); + + router.route('/library/all'); + microLeap(); + expect(root.text).toEqual('LibraryBooks'); + + router.route('/library/1234'); + microLeap(); + expect(root.text).toEqual('LibraryBook 1234'); + + // nothing should change here + router.route('/library/1234/overview'); + microLeap(); + expect(root.text).toEqual('LibraryBook 1234'); + + // nothing should change here + router.route('/library/1234/read'); + microLeap(); + expect(root.text).toEqual('LibraryRead Book 1234'); + })); }); } diff --git a/test/routing/routing_spec.dart b/test/routing/routing_spec.dart index a49820093..90bd8a549 100644 --- a/test/routing/routing_spec.dart +++ b/test/routing/routing_spec.dart @@ -6,8 +6,6 @@ import 'package:angular/angular_dynamic.dart'; import 'dart:async'; main() { - // Do not run in dart2js until the exception is fixed - if (identical(1.0, 1)) return; describe('routing', () { TestBed _; Router router;