From a51a5c29680ffdf4c23dc468ae47ca1d12a561fb Mon Sep 17 00:00:00 2001 From: Marc Laval Date: Tue, 28 Apr 2015 00:23:39 +0200 Subject: [PATCH] chore(build): run forms tests in Node Closes #1565 --- modules/angular2/src/forms/directives.js | 10 ++++++---- modules/angular2/src/forms/validator_directives.js | 3 +-- tools/broccoli/trees/node_tree.ts | 3 +-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/angular2/src/forms/directives.js b/modules/angular2/src/forms/directives.js index 08fc01a666..d28c5248fe 100644 --- a/modules/angular2/src/forms/directives.js +++ b/modules/angular2/src/forms/directives.js @@ -1,9 +1,11 @@ -import {View, Component, Decorator, Ancestor, onChange, ElementRef} from 'angular2/angular2'; +import {Decorator, onChange} from 'angular2/src/core/annotations/annotations'; +import {Ancestor} from 'angular2/src/core/annotations/visibility'; +import {ElementRef} from 'angular2/src/core/compiler/element_injector'; import {Optional} from 'angular2/di'; import {Renderer} from 'angular2/src/render/api'; -import {isBlank, isPresent, isString, CONST} from 'angular2/src/facade/lang'; -import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; -import {ControlGroup, Control} from './model'; +import {isPresent, isString} from 'angular2/src/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {ControlGroup} from './model'; import {Validators} from './validators'; //export interface ControlValueAccessor { diff --git a/modules/angular2/src/forms/validator_directives.js b/modules/angular2/src/forms/validator_directives.js index 1d607e8b57..3691b397f7 100644 --- a/modules/angular2/src/forms/validator_directives.js +++ b/modules/angular2/src/forms/validator_directives.js @@ -1,5 +1,4 @@ -import {Decorator} from 'angular2/angular2'; - +import {Decorator} from 'angular2/src/core/annotations/annotations'; import {Validators} from './validators'; import {ControlDirective} from './directives'; diff --git a/tools/broccoli/trees/node_tree.ts b/tools/broccoli/trees/node_tree.ts index 8eb2bef9fd..3a5aa2da76 100644 --- a/tools/broccoli/trees/node_tree.ts +++ b/tools/broccoli/trees/node_tree.ts @@ -23,8 +23,7 @@ module.exports = function makeNodeTree(destinationPath) { exclude: [ // the following code and tests are not compatible with CJS/node environment 'angular2/src/core/zone/vm_turn_zone.es6', - 'angular2/test/core/zone/**', - 'angular2/test/forms/integration_spec.js' + 'angular2/test/core/zone/**' ] });