Skip to content

Commit d3e391d

Browse files
marclavalmhevery
authored andcommitted
chore(build): run render tests in Node
Closes angular#1358
1 parent 0658d56 commit d3e391d

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

gulpfile.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -208,22 +208,15 @@ var CONFIG = {
208208
test: {
209209
js: {
210210
cjs: [
211-
'/angular2/test/change_detection/**/*_spec.js',
212-
'/angular2/test/core/annotations/**/*_spec.js',
213-
'/angular2/test/core/compiler/**/*_spec.js',
214-
'/angular2/test/di/**/*_spec.js',
215-
'/angular2/test/directives/**/*_spec.js',
216-
'/angular2/test/facade/**/*_spec.js',
217-
'/angular2/test/forms/**/*_spec.js',
218-
'/angular2/test/mock/**/*_spec.js',
219-
'/angular2/test/reflection/**/*_spec.js',
220-
'/angular2/test/services/**/*_spec.js',
221-
'/angular2/test/test_lib/**/*_spec.js'
211+
'/angular2/test/**/*_spec.js'
222212
]
223213
}
224214
}
225215
};
226216
CONFIG.test.js.cjs = CONFIG.test.js.cjs.map(function(s) {return CONFIG.dest.js.cjs + s});
217+
CONFIG.test.js.cjs.push('!**/core/application_spec.js'); //Disabled in nodejs because it relies on Zone.js
218+
CONFIG.test.js.cjs.push('!**/core/zone/vm_turn_zone_spec.js'); //Disabled in nodejs because it relies on Zone.js
219+
CONFIG.test.js.cjs.push('!**/render/dom/events/event_manager_spec.js'); //Disabled in nodejs because it relies on DOM events
227220

228221
// ------------
229222
// clean

modules/angular2/test/render/dom/compiler/directive_parser_spec.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,24 +148,28 @@ export function main() {
148148
expect(eventBinding.source.source).toEqual('doItGlobal()');
149149
});
150150

151+
//TODO: assertions should be enabled when running tests: https://github.com/angular/angular/issues/1340
151152
describe('viewport directives', () => {
152153
it('should not allow multiple viewport directives on the same element', () => {
153154
expect( () => {
154155
process(
155156
el('<template some-vp some-vp2></template>')
156157
);
157-
}).toThrowError('Only one viewport directive is allowed per element - check <template some-vp some-vp2>');
158+
}).toThrowError('Only one viewport directive is allowed per element - check '
159+
+ (assertionsEnabled() ? '<template some-vp some-vp2>' : 'null'));
158160
});
159161

160162
it('should not allow viewport directives on non <template> elements', () => {
161163
expect( () => {
162164
process(
163165
el('<div some-vp></div>')
164166
);
165-
}).toThrowError('Viewport directives need to be placed on <template> elements or elements with template attribute - check <div some-vp>');
167+
}).toThrowError('Viewport directives need to be placed on <template> elements or elements with template attribute - check '
168+
+ (assertionsEnabled() ? '<div some-vp>' : 'null'));
166169
});
167170
});
168171

172+
//TODO: assertions should be enabled when running tests: https://github.com/angular/angular/issues/1340
169173
describe('component directives', () => {
170174
it('should save the component id', () => {
171175
var results = process(
@@ -179,15 +183,17 @@ export function main() {
179183
process(
180184
el('<div some-comp some-comp2></div>')
181185
);
182-
}).toThrowError('Only one component directive is allowed per element - check <div some-comp some-comp2>');
186+
}).toThrowError('Only one component directive is allowed per element - check '
187+
+ (assertionsEnabled() ? '<div some-comp some-comp2>' : 'null'));
183188
});
184189

185190
it('should not allow component directives on <template> elements', () => {
186191
expect( () => {
187192
process(
188193
el('<template some-comp></template>')
189194
);
190-
}).toThrowError('Only template directives are allowed on template elements - check <template some-comp>');
195+
}).toThrowError('Only template directives are allowed on template elements - check '
196+
+ (assertionsEnabled() ? '<template some-comp>' : 'null'));
191197
});
192198
});
193199

0 commit comments

Comments
 (0)