cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: change provide(...) for {provide: ...}

Browse Source 
- provide() is deprecated,
- {} syntax is required by the offline compiler
This commit is contained in:
Victor Berchet
2016-06-02 17:30:40 -07:00
parent 27a47e7841
commit a6ad61d83e
128 changed files with 676 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/@angular/compiler/test/metadata_resolver_spec.ts
View File

@ -29,11 +29,9 @@ import {
AfterViewInit,
AfterViewChecked,
SimpleChanges,
provide
} from '@angular/core';
import {TEST_PROVIDERS} from './test_bindings';
import {MODULE_SUFFIX} from '@angular/compiler/src/util';
import {PLATFORM_DIRECTIVES} from '@angular/core/src/platform_directives_and_pipes';
import {MalformedStylesComponent} from './metadata_resolver_fixture';
@ -92,7 +90,7 @@ export function main() {
describe("platform directives", () => {
beforeEachProviders(
() => [provide(PLATFORM_DIRECTIVES, {useValue: [ADirective], multi: true})]);
() => [{provide: PLATFORM_DIRECTIVES, useValue: [ADirective], multi: true}]);
it('should include platform directives when available',
inject([CompileMetadataResolver], (resolver: CompileMetadataResolver) => {

16
modules/@angular/compiler/test/template_parser_spec.ts
View File

@ -10,7 +10,6 @@ import {
inject,
beforeEachProviders
} from '@angular/core/testing/testing_internal';
import {provide} from '@angular/core';
import {SecurityContext} from '../core_private';
import {Console} from '@angular/core/src/console';
@ -63,9 +62,10 @@ var expressionUnparser = new Unparser();
var someModuleUrl = 'package:someModule';
var MOCK_SCHEMA_REGISTRY = [
provide(
ElementSchemaRegistry,
{useValue: new MockSchemaRegistry({'invalidProp': false}, {'mappedAttr': 'mappedProp'})})
{
provide: ElementSchemaRegistry,
useValue: new MockSchemaRegistry({'invalidProp': false}, {'mappedAttr': 'mappedProp'})
}
];
let zeConsole = console;
@ -80,7 +80,7 @@ export function main() {
function commonBeforeEach() {
beforeEachProviders(() => {
console = new ArrayConsole();
return [provide(Console, {useValue: console})];
return [{provide: Console, useValue: console}];
});
beforeEach(inject([TemplateParser], (parser) => {
var component = CompileDirectiveMetadata.create({
@ -108,7 +108,7 @@ export function main() {
beforeEachProviders(() => [TEST_PROVIDERS, MOCK_SCHEMA_REGISTRY]);
beforeEachProviders(
() => [provide(TEMPLATE_TRANSFORMS, {useValue: new FooAstTransformer(), multi: true})]);
() => [{provide: TEMPLATE_TRANSFORMS, useValue: new FooAstTransformer(), multi: true}]);
describe('single', () => {
commonBeforeEach();
@ -118,7 +118,7 @@ export function main() {
describe('multiple', () => {
beforeEachProviders(
() => [provide(TEMPLATE_TRANSFORMS, {useValue: new BarAstTransformer(), multi: true})]);
() => [{provide: TEMPLATE_TRANSFORMS, useValue: new BarAstTransformer(), multi: true}]);
commonBeforeEach();
it('should compose transformers',
@ -131,7 +131,7 @@ export function main() {
// Uses the actual DomElementSchemaRegistry.
beforeEachProviders(
() =>
[TEST_PROVIDERS, provide(ElementSchemaRegistry, {useClass: DomElementSchemaRegistry})]);
[TEST_PROVIDERS, {provide: ElementSchemaRegistry, useClass: DomElementSchemaRegistry}]);
commonBeforeEach();

6
modules/@angular/compiler/test/test_bindings.ts
View File

@ -4,7 +4,7 @@ import {ElementSchemaRegistry, XHR, UrlResolver} from '@angular/compiler';
import {createUrlResolverWithoutPackagePrefix} from '@angular/compiler/src/url_resolver';
export var TEST_PROVIDERS: any[] = [
provide(ElementSchemaRegistry, {useValue: new MockSchemaRegistry({}, {})}),
provide(XHR, {useClass: MockXHR}),
provide(UrlResolver, {useFactory: createUrlResolverWithoutPackagePrefix})
{provide: ElementSchemaRegistry, useValue: new MockSchemaRegistry({}, {})},
{provide: XHR, useClass: MockXHR},
{provide: UrlResolver, useFactory: createUrlResolverWithoutPackagePrefix}
];

9
modules/@angular/compiler/test/test_component_builder_spec.ts
View File

@ -18,7 +18,6 @@ import {
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
import {
Injectable,
provide,
Component,
Input,
ViewMetadata,
@ -290,7 +289,7 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
tcb.overrideProviders(TestBindingsComp,
[provide(FancyService, {useClass: MockFancyService})])
[{provide: FancyService, useClass: MockFancyService}])
.createAsync(TestBindingsComp)
.then((componentFixture) => {
componentFixture.detectChanges();
@ -305,7 +304,7 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
tcb.overrideViewProviders(TestViewBindingsComp,
[provide(FancyService, {useClass: MockFancyService})])
[{provide: FancyService, useClass: MockFancyService}])
.createAsync(TestViewBindingsComp)
.then((componentFixture) => {
componentFixture.detectChanges();
@ -337,7 +336,7 @@ export function main() {
}));
it('should auto detect changes if ComponentFixtureAutoDetect is provided as true',
withProviders(() => [provide(ComponentFixtureAutoDetect, {useValue: true})])
withProviders(() => [{provide: ComponentFixtureAutoDetect, useValue: true}])
.inject([TestComponentBuilder, AsyncTestCompleter],
(tcb: TestComponentBuilder, async) => {
@ -551,7 +550,7 @@ export function main() {
}));
describe('No NgZone', () => {
beforeEachProviders(() => [provide(ComponentFixtureNoNgZone, {useValue: true})]);
beforeEachProviders(() => [{provide: ComponentFixtureNoNgZone, useValue: true}]);
it('calling autoDetectChanges raises an error', () => {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder,