From d8aeb40b4920ae114666a88aed05556a454b0760 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Tue, 31 Mar 2015 16:55:46 +0200 Subject: [PATCH] reafactor(XHR): rename XHRMock to MockXHR for consistency --- modules/angular2/src/mock/xhr_mock.js | 2 +- modules/angular2/src/test_lib/test_injector.js | 4 ++-- modules/angular2/test/mock/xhr_mock_spec.js | 6 +++--- .../test/render/dom/compiler/template_loader_spec.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/angular2/src/mock/xhr_mock.js b/modules/angular2/src/mock/xhr_mock.js index 1bf0d7d9c5..a59d73bbc9 100644 --- a/modules/angular2/src/mock/xhr_mock.js +++ b/modules/angular2/src/mock/xhr_mock.js @@ -3,7 +3,7 @@ import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection import {isBlank, isPresent, normalizeBlank, BaseException} from 'angular2/src/facade/lang'; import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; -export class XHRMock extends XHR { +export class MockXHR extends XHR { _expectations: List<_Expectation>; _definitions: Map; _requests: List; diff --git a/modules/angular2/src/test_lib/test_injector.js b/modules/angular2/src/test_lib/test_injector.js index 7fe3f696b2..92236aae1d 100644 --- a/modules/angular2/src/test_lib/test_injector.js +++ b/modules/angular2/src/test_lib/test_injector.js @@ -22,7 +22,7 @@ import {appDocumentToken} from 'angular2/src/core/application_tokens'; import {EventManager, DomEventsPlugin} from 'angular2/src/render/dom/events/event_manager'; import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock'; -import {XHRMock} from 'angular2/src/mock/xhr_mock'; +import {MockXHR} from 'angular2/src/mock/xhr_mock'; import {MockVmTurnZone} from 'angular2/src/mock/vm_turn_zone_mock'; import {TestBed} from './test_bed'; @@ -76,7 +76,7 @@ function _getAppBindings() { Parser, Lexer, ExceptionHandler, - bind(XHR).toClass(XHRMock), + bind(XHR).toClass(MockXHR), ComponentUrlMapper, UrlResolver, StyleUrlResolver, diff --git a/modules/angular2/test/mock/xhr_mock_spec.js b/modules/angular2/test/mock/xhr_mock_spec.js index 73460d4caa..e253ae8cb7 100644 --- a/modules/angular2/test/mock/xhr_mock_spec.js +++ b/modules/angular2/test/mock/xhr_mock_spec.js @@ -10,16 +10,16 @@ import { IS_DARTIUM, it, } from 'angular2/test_lib'; -import {XHRMock} from 'angular2/src/mock/xhr_mock'; +import {MockXHR} from 'angular2/src/mock/xhr_mock'; import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; import {isPresent} from 'angular2/src/facade/lang'; export function main() { - describe('XHRMock', () => { + describe('MockXHR', () => { var xhr; beforeEach(() => { - xhr = new XHRMock(); + xhr = new MockXHR(); }); function expectResponse(request: Promise, url: string, response: string, done = null) { diff --git a/modules/angular2/test/render/dom/compiler/template_loader_spec.js b/modules/angular2/test/render/dom/compiler/template_loader_spec.js index e21b22b93c..7ff41e58d7 100644 --- a/modules/angular2/test/render/dom/compiler/template_loader_spec.js +++ b/modules/angular2/test/render/dom/compiler/template_loader_spec.js @@ -16,14 +16,14 @@ import {UrlResolver} from 'angular2/src/services/url_resolver'; import {Template} from 'angular2/src/render/api'; import {PromiseWrapper} from 'angular2/src/facade/async'; -import {XHRMock} from 'angular2/src/mock/xhr_mock'; +import {MockXHR} from 'angular2/src/mock/xhr_mock'; export function main() { describe('TemplateLoader', () => { var loader, xhr; beforeEach(() => { - xhr = new XHRMock() + xhr = new MockXHR(); loader = new TemplateLoader(xhr, new FakeUrlResolver()); });