From dd7910347a89d8d3cf341ec1fdd6deeb896ccf72 Mon Sep 17 00:00:00 2001 From: Marc Laval Date: Thu, 25 Jun 2015 18:29:19 +0200 Subject: [PATCH] chore(windows): fix the test.server.dart task Closes #2703 --- modules/angular2/src/transform/reflection_remover/rewriter.dart | 2 +- .../angular2/test/transform/directive_processor/all_tests.dart | 2 +- .../angular2/test/transform/reflection_remover/all_tests.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/angular2/src/transform/reflection_remover/rewriter.dart b/modules/angular2/src/transform/reflection_remover/rewriter.dart index 513e8e6ad6..0d7607e3eb 100644 --- a/modules/angular2/src/transform/reflection_remover/rewriter.dart +++ b/modules/angular2/src/transform/reflection_remover/rewriter.dart @@ -113,7 +113,7 @@ class Rewriter { String _importDebugReflectionCapabilities(ImportDirective node) { var uri = '${node.uri}'; - uri = path.join(path.dirname(uri), 'debug_${path.basename(uri)}'); + uri = path.join(path.dirname(uri), 'debug_${path.basename(uri)}').replaceAll('\\', '/'); var asClause = node.prefix != null ? ' as ${node.prefix}' : ''; return 'import $uri$asClause;'; } diff --git a/modules/angular2/test/transform/directive_processor/all_tests.dart b/modules/angular2/test/transform/directive_processor/all_tests.dart index e5dbfe9f86..cff6f97eec 100644 --- a/modules/angular2/test/transform/directive_processor/all_tests.dart +++ b/modules/angular2/test/transform/directive_processor/all_tests.dart @@ -91,7 +91,7 @@ void _testNgDeps(String name, String inputPath, expect(await reader.hasInput(expectedId)).toBeFalse(); } else { expect(formatter.format(output)) - .toEqual(await reader.readAsString(expectedId)); + .toEqual((await reader.readAsString(expectedId)).replaceAll('\r\n', '\n')); } }); } diff --git a/modules/angular2/test/transform/reflection_remover/all_tests.dart b/modules/angular2/test/transform/reflection_remover/all_tests.dart index ec85a17b3a..8934cd0df8 100644 --- a/modules/angular2/test/transform/reflection_remover/all_tests.dart +++ b/modules/angular2/test/transform/reflection_remover/all_tests.dart @@ -14,7 +14,7 @@ import '../common/read_file.dart'; void allTests() { var codegen = new Codegen('web/index.dart', ['web/index.ng_deps.dart']); - var code = readFile('reflection_remover/index.dart'); + var code = readFile('reflection_remover/index.dart').replaceAll('\r\n', '\n'); it('should remove uses of mirrors & ' 'insert calls to generated code by default.', () {