From 579b8904461609bac7ffe3645304fffc07b130db Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Sat, 23 Jan 2016 18:56:05 -0800 Subject: [PATCH] chore(dart) Update dev dependency on code_tranformers Closes https://github.com/angular/angular/issues/6665 --- modules/angular2/pubspec.yaml | 2 +- modules_dart/transform/pubspec.yaml | 4 ++-- .../test/transform/common/recording_logger.dart | 2 +- .../test/transform/inliner_for_test/all_tests.dart | 10 ++++------ .../test/transform/integration/all_tests.dart | 8 +++----- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/modules/angular2/pubspec.yaml b/modules/angular2/pubspec.yaml index 75b774e020..ba5af50af6 100644 --- a/modules/angular2/pubspec.yaml +++ b/modules/angular2/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: source_span: '^1.0.0' stack_trace: '^1.1.1' dev_dependencies: - code_transformers: '>=0.2.9+4 <0.4.0' + transformer_test: '^0.2.0' guinness: '^0.1.18' quiver: '^0.21.4' test: '^0.12.6' diff --git a/modules_dart/transform/pubspec.yaml b/modules_dart/transform/pubspec.yaml index 64316e0c5e..286ada6b5e 100644 --- a/modules_dart/transform/pubspec.yaml +++ b/modules_dart/transform/pubspec.yaml @@ -5,9 +5,8 @@ environment: dependencies: angular2: path: ../../dist/dart/angular2 - analyzer: '>=0.24.4 <0.27.0' + analyzer: '>=0.24.4 <0.28.0' barback: '^0.15.2+2' - code_transformers: '^0.2.8' dart_style: '>=0.1.8 <0.3.0' glob: '^1.0.0' html: '^0.12.0' @@ -19,5 +18,6 @@ dependencies: source_span: '^1.0.0' stack_trace: '^1.1.1' dev_dependencies: + transformer_test: '^0.2.0' guinness: any test: '>=0.12.0 <0.13.0' diff --git a/modules_dart/transform/test/transform/common/recording_logger.dart b/modules_dart/transform/test/transform/common/recording_logger.dart index b506e39d47..9dce3d1d4a 100644 --- a/modules_dart/transform/test/transform/common/recording_logger.dart +++ b/modules_dart/transform/test/transform/common/recording_logger.dart @@ -1,4 +1,4 @@ -library angular2.test.transform.common.read_file; +library angular2.test.transform.common.recording_logger; import 'package:barback/barback.dart'; import 'package:source_span/source_span.dart'; diff --git a/modules_dart/transform/test/transform/inliner_for_test/all_tests.dart b/modules_dart/transform/test/transform/inliner_for_test/all_tests.dart index a1a737d914..6b020a0d5d 100644 --- a/modules_dart/transform/test/transform/inliner_for_test/all_tests.dart +++ b/modules_dart/transform/test/transform/inliner_for_test/all_tests.dart @@ -4,9 +4,9 @@ import 'dart:async'; import 'dart:convert' show LineSplitter; import 'package:barback/barback.dart'; -import 'package:code_transformers/tests.dart'; import 'package:guinness/guinness.dart'; import 'package:dart_style/dart_style.dart'; +import 'package:transformer_test/utils.dart'; import 'package:angular2/src/transform/common/annotation_matcher.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; @@ -26,7 +26,7 @@ DartFormatter formatter = new DartFormatter(); AnnotationMatcher annotationMatcher; void allTests() { - AssetReader absoluteReader; + TestAssetReader absoluteReader; beforeEach(() { absoluteReader = new TestAssetReader(); @@ -198,8 +198,7 @@ void _runAbsoluteUrlEndToEndTest() { [transformer] ], inputMap, - outputMap, - []); + outputMap); } void _runMultiStylesEndToEndTest() { @@ -224,8 +223,7 @@ void _runMultiStylesEndToEndTest() { [transformer] ], inputMap, - outputMap, - []); + outputMap); } /// Smooths over differences in CWD between IDEs and running tests in Travis. diff --git a/modules_dart/transform/test/transform/integration/all_tests.dart b/modules_dart/transform/test/transform/integration/all_tests.dart index 2995598db6..f8c044ff35 100644 --- a/modules_dart/transform/test/transform/integration/all_tests.dart +++ b/modules_dart/transform/test/transform/integration/all_tests.dart @@ -2,8 +2,8 @@ library angular2.test.transform.integration; import 'package:angular2/src/platform/server/html_adapter.dart'; import 'package:angular2/transformer.dart'; -import 'package:code_transformers/tests.dart'; import 'package:dart_style/dart_style.dart'; +import 'package:transformer_test/utils.dart'; import '../common/read_file.dart'; import 'deferred_files/expected/output.dart' as deferredOuts; @@ -205,8 +205,7 @@ void allTests() { [transform] ], config.assetPathToInputPath, - config.assetPathToExpectedOutputPath, - []); + config.assetPathToExpectedOutputPath); } } @@ -233,8 +232,7 @@ void _testDeferredRewriter() { [transform] ], inputs, - outputs, - []); + outputs); } /// Smooths over differences in CWD between IDEs and running tests in Travis.