refactor(tests): rename beforeEachBindings -> beforeEachProviders

Change beforeEachBindings to beforeEachProviders but preserve the
@deprecated method beforeEachBindings, in order to keep a working
deprecation warning
This commit is contained in:
Jesper Rønn-Jensen 2015-11-11 14:28:23 +01:00 committed by Jeremy Elbourn
parent 7f783289ab
commit 070d818e68
32 changed files with 49 additions and 49 deletions

View File

@ -46,7 +46,7 @@ void testSetup() {
reflector.reflectionCapabilities = new ReflectionCapabilities(); reflector.reflectionCapabilities = new ReflectionCapabilities();
// beforeEach configuration: // beforeEach configuration:
// - Priority 3: clear the bindings before each test, // - Priority 3: clear the bindings before each test,
// - Priority 2: collect the bindings before each test, see beforeEachBindings(), // - Priority 2: collect the bindings before each test, see beforeEachProviders(),
// - Priority 1: create the test injector to be used in beforeEach() and it() // - Priority 1: create the test injector to be used in beforeEach() and it()
gns.beforeEach(() { gns.beforeEach(() {
@ -74,7 +74,7 @@ void testSetup() {
* *
* Example: * Example:
* *
* beforeEachBindings(() => [ * beforeEachProviders(() => [
* bind(Compiler).toClass(MockCompiler), * bind(Compiler).toClass(MockCompiler),
* bind(SomeToken).toValue(myValue), * bind(SomeToken).toValue(myValue),
* ]); * ]);

View File

@ -104,16 +104,16 @@ export function beforeEach(fn: FunctionWithParamTokens | SyncTestFn): void {
* *
* Example: * Example:
* *
* beforeEachBindings(() => [ * beforeEachProviders(() => [
* provide(Compiler, {useClass: MockCompiler}), * provide(Compiler, {useClass: MockCompiler}),
* provide(SomeToken, {useValue: myValue}), * provide(SomeToken, {useValue: myValue}),
* ]); * ]);
*/ */
export function beforeEachProviders(fn): void { export function beforeEachProviders(fn): void {
jsmBeforeEach(() => { jsmBeforeEach(() => {
var bindings = fn(); var providers = fn();
if (!bindings) return; if (!providers) return;
testProviders = [...testProviders, ...bindings]; testProviders = [...testProviders, ...providers];
}); });
} }

View File

@ -3,7 +3,7 @@ import {
AsyncTestCompleter, AsyncTestCompleter,
TestComponentBuilder, TestComponentBuilder,
beforeEach, beforeEach,
beforeEachBindings, beforeEachProviders,
ddescribe, ddescribe,
xdescribe, xdescribe,
describe, describe,
@ -30,7 +30,7 @@ export function main() {
describe('binding to CSS class list', () => { describe('binding to CSS class list', () => {
describe('viewpool support', () => { describe('viewpool support', () => {
beforeEachBindings(() => { return [provide(APP_VIEW_POOL_CAPACITY, {useValue: 100})]; }); beforeEachProviders(() => { return [provide(APP_VIEW_POOL_CAPACITY, {useValue: 100})]; });
it('should clean up when the directive is destroyed', it('should clean up when the directive is destroyed',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {

View File

@ -2,7 +2,7 @@ import {
AsyncTestCompleter, AsyncTestCompleter,
TestComponentBuilder, TestComponentBuilder,
beforeEach, beforeEach,
beforeEachBindings, beforeEachProviders,
ddescribe, ddescribe,
describe, describe,
el, el,

View File

@ -2,7 +2,7 @@ import {
AsyncTestCompleter, AsyncTestCompleter,
TestComponentBuilder, TestComponentBuilder,
beforeEach, beforeEach,
beforeEachBindings, beforeEachProviders,
ddescribe, ddescribe,
xdescribe, xdescribe,
describe, describe,

View File

@ -10,7 +10,7 @@ import {
it, it,
xit, xit,
TestComponentBuilder, TestComponentBuilder,
beforeEachBindings beforeEachProviders
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';
import {MapWrapper} from 'angular2/src/facade/collection'; import {MapWrapper} from 'angular2/src/facade/collection';
import { import {
@ -39,7 +39,7 @@ import {TEST_PROVIDERS} from './test_bindings';
export function main() { export function main() {
describe('ChangeDefinitionFactory', () => { describe('ChangeDefinitionFactory', () => {
beforeEachBindings(() => TEST_PROVIDERS); beforeEachProviders(() => TEST_PROVIDERS);
var parser: TemplateParser; var parser: TemplateParser;
var dispatcher: TestDispatcher; var dispatcher: TestDispatcher;

View File

@ -10,7 +10,7 @@ import {
afterEach, afterEach,
AsyncTestCompleter, AsyncTestCompleter,
inject, inject,
beforeEachBindings beforeEachProviders
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';
import {provide} from 'angular2/src/core/di'; import {provide} from 'angular2/src/core/di';
@ -56,7 +56,7 @@ var THIS_MODULE_REF = moduleRef(THIS_MODULE_URL);
export function main() { export function main() {
describe('ChangeDetectorCompiler', () => { describe('ChangeDetectorCompiler', () => {
beforeEachBindings(() => TEST_PROVIDERS); beforeEachProviders(() => TEST_PROVIDERS);
var parser: TemplateParser; var parser: TemplateParser;
var compiler: ChangeDetectionCompiler; var compiler: ChangeDetectionCompiler;
@ -78,7 +78,7 @@ export function main() {
} }
describe('no jit', () => { describe('no jit', () => {
beforeEachBindings(() => [ beforeEachProviders(() => [
provide(ChangeDetectorGenConfig, provide(ChangeDetectorGenConfig,
{useValue: new ChangeDetectorGenConfig(true, false, false)}) {useValue: new ChangeDetectorGenConfig(true, false, false)})
]); ]);
@ -89,7 +89,7 @@ export function main() {
}); });
describe('jit', () => { describe('jit', () => {
beforeEachBindings(() => [ beforeEachProviders(() => [
provide(ChangeDetectorGenConfig, provide(ChangeDetectorGenConfig,
{useValue: new ChangeDetectorGenConfig(true, false, true)}) {useValue: new ChangeDetectorGenConfig(true, false, true)})
]); ]);

View File

@ -10,7 +10,7 @@ import {
afterEach, afterEach,
AsyncTestCompleter, AsyncTestCompleter,
inject, inject,
beforeEachBindings beforeEachProviders
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';
import { import {
@ -84,7 +84,7 @@ var compTypeTemplateId: Map<CompileTypeMetadata, string> = MapWrapper.createFrom
export function main() { export function main() {
describe('CommandCompiler', () => { describe('CommandCompiler', () => {
beforeEachBindings(() => TEST_PROVIDERS); beforeEachProviders(() => TEST_PROVIDERS);
var parser: TemplateParser; var parser: TemplateParser;
var commandCompiler: CommandCompiler; var commandCompiler: CommandCompiler;

View File

@ -10,7 +10,7 @@ import {
afterEach, afterEach,
AsyncTestCompleter, AsyncTestCompleter,
inject, inject,
beforeEachBindings beforeEachProviders
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';
import {Component, View, provide} from 'angular2/core'; import {Component, View, provide} from 'angular2/core';
@ -35,7 +35,7 @@ export function main() {
var protoViewFactorySpy; var protoViewFactorySpy;
var someProtoView; var someProtoView;
beforeEachBindings(() => { beforeEachProviders(() => {
protoViewFactorySpy = new SpyProtoViewFactory(); protoViewFactorySpy = new SpyProtoViewFactory();
someProtoView = new AppProtoView(null, null, null, null, null, null, null); someProtoView = new AppProtoView(null, null, null, null, null, null, null);
protoViewFactorySpy.spy('createHost').andReturn(someProtoView); protoViewFactorySpy.spy('createHost').andReturn(someProtoView);

View File

@ -10,7 +10,7 @@ import {
afterEach, afterEach,
AsyncTestCompleter, AsyncTestCompleter,
inject, inject,
beforeEachBindings beforeEachProviders
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';
import {provide} from 'angular2/src/core/di'; import {provide} from 'angular2/src/core/di';
import {SpyXHR} from './spies'; import {SpyXHR} from './spies';
@ -43,7 +43,7 @@ export function main() {
describe('StyleCompiler', () => { describe('StyleCompiler', () => {
var xhr: SpyXHR; var xhr: SpyXHR;
beforeEachBindings(() => { beforeEachProviders(() => {
xhr = <any>new SpyXHR(); xhr = <any>new SpyXHR();
return [TEST_PROVIDERS, provide(XHR, {useValue: xhr})]; return [TEST_PROVIDERS, provide(XHR, {useValue: xhr})];
}); });

View File

@ -10,7 +10,7 @@ import {
it, it,
xit, xit,
TestComponentBuilder, TestComponentBuilder,
beforeEachBindings beforeEachProviders
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';
import { import {
@ -29,7 +29,7 @@ export function main() {
var dirType: CompileTypeMetadata; var dirType: CompileTypeMetadata;
var dirTypeWithHttpUrl: CompileTypeMetadata; var dirTypeWithHttpUrl: CompileTypeMetadata;
beforeEachBindings(() => TEST_PROVIDERS); beforeEachProviders(() => TEST_PROVIDERS);
beforeEach(() => { beforeEach(() => {
dirType = new CompileTypeMetadata({moduleUrl: 'package:some/module/a.js', name: 'SomeComp'}); dirType = new CompileTypeMetadata({moduleUrl: 'package:some/module/a.js', name: 'SomeComp'});

View File

@ -10,7 +10,7 @@ import {
afterEach, afterEach,
AsyncTestCompleter, AsyncTestCompleter,
inject, inject,
beforeEachBindings beforeEachProviders
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';
import {HtmlParser} from 'angular2/src/compiler/html_parser'; import {HtmlParser} from 'angular2/src/compiler/html_parser';

View File

@ -8,7 +8,7 @@ import {
expect, expect,
iit, iit,
inject, inject,
beforeEachBindings, beforeEachProviders,
it, it,
xit, xit,
TestComponentBuilder TestComponentBuilder

View File

@ -9,7 +9,7 @@ import {
inject, inject,
it, it,
xit, xit,
beforeEachBindings, beforeEachProviders,
SpyObject, SpyObject,
stringifyElement stringifyElement
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';

View File

@ -10,7 +10,7 @@ import {
afterEach, afterEach,
AsyncTestCompleter, AsyncTestCompleter,
inject, inject,
beforeEachBindings beforeEachProviders
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';
import {Component, View, provide} from 'angular2/core'; import {Component, View, provide} from 'angular2/core';
@ -33,7 +33,7 @@ export function main() {
var someProtoView; var someProtoView;
var cht: CompiledHostTemplate; var cht: CompiledHostTemplate;
beforeEachBindings(() => { beforeEachProviders(() => {
protoViewFactorySpy = new SpyProtoViewFactory(); protoViewFactorySpy = new SpyProtoViewFactory();
someProtoView = new AppProtoView(null, null, null, null, null, null, null); someProtoView = new AppProtoView(null, null, null, null, null, null, null);
protoViewFactorySpy.spy('createHost').andReturn(someProtoView); protoViewFactorySpy.spy('createHost').andReturn(someProtoView);

View File

@ -9,7 +9,7 @@ import {
expect, expect,
iit, iit,
inject, inject,
beforeEachBindings, beforeEachProviders,
it, it,
xit, xit,
TestComponentBuilder, TestComponentBuilder,

View File

@ -9,7 +9,7 @@ import {
expect, expect,
iit, iit,
inject, inject,
beforeEachBindings, beforeEachProviders,
it, it,
xit xit
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';

View File

@ -9,7 +9,7 @@ import {
expect, expect,
iit, iit,
inject, inject,
beforeEachBindings, beforeEachProviders,
it, it,
xit xit
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';

View File

@ -9,7 +9,7 @@ import {
expect, expect,
iit, iit,
inject, inject,
beforeEachBindings, beforeEachProviders,
it, it,
xit, xit,
Log, Log,

View File

@ -9,7 +9,7 @@ import {
expect, expect,
iit, iit,
inject, inject,
beforeEachBindings, beforeEachProviders,
it, it,
xit, xit,
SpyObject, SpyObject,

View File

@ -9,7 +9,7 @@ import {
inject, inject,
it, it,
xit, xit,
beforeEachBindings, beforeEachProviders,
SpyObject, SpyObject,
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';

View File

@ -9,7 +9,7 @@ import {
expect, expect,
iit, iit,
inject, inject,
beforeEachBindings, beforeEachProviders,
it, it,
xit, xit,
SpyObject, SpyObject,

View File

@ -8,7 +8,7 @@ import {
expect, expect,
inject, inject,
beforeEach, beforeEach,
beforeEachBindings, beforeEachProviders,
SpyObject SpyObject
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';

View File

@ -8,7 +8,7 @@ import {
expect, expect,
iit, iit,
inject, inject,
beforeEachBindings, beforeEachProviders,
it, it,
xit, xit,
TestComponentBuilder TestComponentBuilder

View File

@ -12,7 +12,7 @@ import "package:angular2/testing_internal.dart"
expect, expect,
beforeEach, beforeEach,
createTestInjector, createTestInjector,
beforeEachBindings, beforeEachProviders,
SpyObject, SpyObject,
proxy; proxy;
import "package:angular2/src/web_workers/debug_tools/multi_client_server_message_bus.dart"; import "package:angular2/src/web_workers/debug_tools/multi_client_server_message_bus.dart";

View File

@ -11,7 +11,7 @@ import "package:angular2/testing_internal.dart"
expect, expect,
beforeEach, beforeEach,
createTestInjector, createTestInjector,
beforeEachBindings, beforeEachProviders,
SpyObject, SpyObject,
proxy; proxy;
import "package:angular2/src/web_workers/debug_tools/single_client_server_message_bus.dart"; import "package:angular2/src/web_workers/debug_tools/single_client_server_message_bus.dart";

View File

@ -9,7 +9,7 @@ import "package:angular2/testing_internal.dart"
expect, expect,
beforeEach, beforeEach,
createTestInjector, createTestInjector,
beforeEachBindings, beforeEachProviders,
SpyObject, SpyObject,
proxy; proxy;
import "package:angular2/src/web_workers/debug_tools/web_socket_message_bus.dart"; import "package:angular2/src/web_workers/debug_tools/web_socket_message_bus.dart";

View File

@ -6,7 +6,7 @@ import {
expect, expect,
beforeEach, beforeEach,
createTestInjector, createTestInjector,
beforeEachBindings, beforeEachProviders,
SpyObject, SpyObject,
proxy proxy
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';

View File

@ -6,7 +6,7 @@ import {
expect, expect,
beforeEach, beforeEach,
createTestInjector, createTestInjector,
beforeEachBindings, beforeEachProviders,
SpyObject, SpyObject,
proxy proxy
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';
@ -32,7 +32,7 @@ export function main() {
const RESULT = 20; const RESULT = 20;
const ID = "methodId"; const ID = "methodId";
beforeEachBindings(() => [ beforeEachProviders(() => [
provide(ON_WEB_WORKER, {useValue: true}), provide(ON_WEB_WORKER, {useValue: true}),
RenderProtoViewRefStore, RenderProtoViewRefStore,
RenderViewWithFragmentsStore RenderViewWithFragmentsStore

View File

@ -6,7 +6,7 @@ import {
expect, expect,
beforeEach, beforeEach,
createTestInjector, createTestInjector,
beforeEachBindings, beforeEachProviders,
SpyObject, SpyObject,
proxy proxy
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';
@ -26,7 +26,7 @@ import {EVENT_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api';
export function main() { export function main() {
describe("EventDispatcher", () => { describe("EventDispatcher", () => {
beforeEachBindings(() => [ beforeEachProviders(() => [
provide(ON_WEB_WORKER, {useValue: true}), provide(ON_WEB_WORKER, {useValue: true}),
RenderProtoViewRefStore, RenderProtoViewRefStore,
RenderViewWithFragmentsStore RenderViewWithFragmentsStore

View File

@ -8,7 +8,7 @@ import {
expect, expect,
beforeEach, beforeEach,
createTestInjector, createTestInjector,
beforeEachBindings, beforeEachProviders,
TestComponentBuilder TestComponentBuilder
} from "angular2/testing_internal"; } from "angular2/testing_internal";
import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {DOM} from 'angular2/src/platform/dom/dom_adapter';
@ -100,7 +100,7 @@ export function main() {
var uiInjector: Injector; var uiInjector: Injector;
var uiRenderViewStore: RenderViewWithFragmentsStore; var uiRenderViewStore: RenderViewWithFragmentsStore;
beforeEachBindings(() => { beforeEachProviders(() => {
var uiRenderProtoViewStore = new RenderProtoViewRefStore(false); var uiRenderProtoViewStore = new RenderProtoViewRefStore(false);
uiRenderViewStore = new RenderViewWithFragmentsStore(false); uiRenderViewStore = new RenderViewWithFragmentsStore(false);
uiInjector = createTestInjector([ uiInjector = createTestInjector([

View File

@ -6,7 +6,7 @@ import {
expect, expect,
beforeEach, beforeEach,
createTestInjector, createTestInjector,
beforeEachBindings beforeEachProviders
} from 'angular2/testing_internal'; } from 'angular2/testing_internal';
import {SpyMessageBroker} from './spies'; import {SpyMessageBroker} from './spies';
import {Type} from 'angular2/src/facade/lang'; import {Type} from 'angular2/src/facade/lang';