Skip to content

Commit 6abed8d

Browse files
committed
fix(test_lib): don't mock out XHR via MockXHR by default in tests
This is useful for the compiler tests, but otherwise it's not useful. Additionally if an application has external templates (as is common) then we should actually fetch these templates in tests. Fixes angular#4539 Closes angular#4682
1 parent eacc8e3 commit 6abed8d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

modules/angular2/src/test_lib/test_injector.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import {
3030

3131
import {MockDirectiveResolver} from 'angular2/src/mock/directive_resolver_mock';
3232
import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock';
33-
import {MockXHR} from 'angular2/src/core/compiler/xhr_mock';
3433
import {MockLocationStrategy} from 'angular2/src/mock/mock_location_strategy';
3534
import {LocationStrategy} from 'angular2/src/router/location_strategy';
3635
import {MockNgZone} from 'angular2/src/mock/ng_zone_mock';
@@ -116,7 +115,7 @@ function _getAppBindings() {
116115
PipeResolver,
117116
provide(ExceptionHandler, {asValue: new ExceptionHandler(DOM)}),
118117
provide(LocationStrategy, {asClass: MockLocationStrategy}),
119-
provide(XHR, {asClass: MockXHR}),
118+
XHR,
120119
TestComponentBuilder,
121120
provide(NgZone, {asClass: MockNgZone}),
122121
provide(AnimationBuilder, {asClass: MockAnimationBuilder}),
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import {provide, Provider} from 'angular2/src/core/di';
22
import {MockSchemaRegistry} from './schema_registry_mock';
33
import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry';
4+
import {MockXHR} from 'angular2/src/core/compiler/xhr_mock';
5+
import {XHR} from 'angular2/src/core/compiler/xhr';
46

5-
export var TEST_PROVIDERS =
6-
[provide(ElementSchemaRegistry, {asValue: new MockSchemaRegistry({}, {})})];
7+
export var TEST_PROVIDERS = [
8+
provide(ElementSchemaRegistry, {asValue: new MockSchemaRegistry({}, {})}),
9+
provide(XHR, {asClass: MockXHR})
10+
];

0 commit comments

Comments
 (0)