From 132829e5e28bb1c8cac43d59c0e64b8a6fa6695c Mon Sep 17 00:00:00 2001 From: Tobias Bosch Date: Mon, 25 Jan 2016 17:20:06 -0800 Subject: [PATCH] chore(core): deactivate the tests that use Dart isolates These are broken with Dart 1.13.2 stable, and will soon be obsolete (see #6270). --- .../test/compiler/change_detector_compiler_spec.ts | 7 ++++++- modules/angular2/test/compiler/eval_module_spec.ts | 5 +++++ .../angular2/test/compiler/style_compiler_spec.ts | 14 +++++++++++++- .../test/compiler/template_compiler_spec.ts | 7 ++++++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/modules/angular2/test/compiler/change_detector_compiler_spec.ts b/modules/angular2/test/compiler/change_detector_compiler_spec.ts index 2f76e0ef7d..876c13170a 100644 --- a/modules/angular2/test/compiler/change_detector_compiler_spec.ts +++ b/modules/angular2/test/compiler/change_detector_compiler_spec.ts @@ -14,7 +14,7 @@ import { } from 'angular2/testing_internal'; import {provide} from 'angular2/src/core/di'; -import {CONST_EXPR, stringify} from 'angular2/src/facade/lang'; +import {CONST_EXPR, stringify, IS_DART} from 'angular2/src/facade/lang'; import {MapWrapper} from 'angular2/src/facade/collection'; import {Promise} from 'angular2/src/facade/async'; @@ -55,6 +55,11 @@ var THIS_MODULE_URL = `package:${THIS_MODULE_ID}${MODULE_SUFFIX}`; var THIS_MODULE_REF = moduleRef(THIS_MODULE_URL); export function main() { + // Dart's isolate support is broken, and these tests will be obsolote soon with + // https://github.com/angular/angular/issues/6270 + if (IS_DART) { + return; + } describe('ChangeDetectorCompiler', () => { beforeEachProviders(() => [ TEST_PROVIDERS, diff --git a/modules/angular2/test/compiler/eval_module_spec.ts b/modules/angular2/test/compiler/eval_module_spec.ts index 2209f4a4ca..8a208d20aa 100644 --- a/modules/angular2/test/compiler/eval_module_spec.ts +++ b/modules/angular2/test/compiler/eval_module_spec.ts @@ -22,6 +22,11 @@ export var TEST_VALUE = 23; const THIS_MODULE_URL = `package:angular2/test/compiler/eval_module_spec${IS_DART?'.dart':'.js'}`; export function main() { + // Dart's isolate support is broken, and these tests will be obsolote soon with + // https://github.com/angular/angular/issues/6270 + if (IS_DART) { + return; + } describe('evalModule', () => { it('should call the "run" function and allow to use imports', inject([AsyncTestCompleter], (async) => { diff --git a/modules/angular2/test/compiler/style_compiler_spec.ts b/modules/angular2/test/compiler/style_compiler_spec.ts index d945bc7579..4074d612ee 100644 --- a/modules/angular2/test/compiler/style_compiler_spec.ts +++ b/modules/angular2/test/compiler/style_compiler_spec.ts @@ -17,7 +17,14 @@ import {SpyXHR} from './spies'; import {XHR} from 'angular2/src/compiler/xhr'; import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; -import {CONST_EXPR, isPresent, isBlank, StringWrapper, isArray} from 'angular2/src/facade/lang'; +import { + CONST_EXPR, + isPresent, + isBlank, + StringWrapper, + isArray, + IS_DART +} from 'angular2/src/facade/lang'; import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; import {evalModule} from './eval_module'; import {StyleCompiler} from 'angular2/src/compiler/style_compiler'; @@ -40,6 +47,11 @@ var IMPORT_ABS_STYLESHEET_URL_WITH_IMPORT = `package:angular2/test/compiler/style_compiler_transitive_import.css`; export function main() { + // Dart's isolate support is broken, and these tests will be obsolote soon with + // https://github.com/angular/angular/issues/6270 + if (IS_DART) { + return; + } describe('StyleCompiler', () => { var xhr: SpyXHR; diff --git a/modules/angular2/test/compiler/template_compiler_spec.ts b/modules/angular2/test/compiler/template_compiler_spec.ts index b1d144fb82..fce620019e 100644 --- a/modules/angular2/test/compiler/template_compiler_spec.ts +++ b/modules/angular2/test/compiler/template_compiler_spec.ts @@ -14,7 +14,7 @@ import { } from 'angular2/testing_internal'; import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {Type, isPresent, isBlank, stringify, isString} from 'angular2/src/facade/lang'; +import {Type, isPresent, isBlank, stringify, isString, IS_DART} from 'angular2/src/facade/lang'; import { MapWrapper, SetWrapper, @@ -58,6 +58,11 @@ var REFLECTION_CAPS_MODULE_REF = moduleRef(`package:angular2/src/core/reflection/reflection_capabilities${MODULE_SUFFIX}`); export function main() { + // Dart's isolate support is broken, and these tests will be obsolote soon with + // https://github.com/angular/angular/issues/6270 + if (IS_DART) { + return; + } describe('TemplateCompiler', () => { var compiler: TemplateCompiler; var runtimeMetadataResolver: RuntimeMetadataResolver;