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

refactor(core/testing): remove deprecated ViewMetadata (#10837)

Browse Source 
Note that this doesn't actually remove all uses, but makes them
private.
This commit is contained in:
Julie Ralph
2016-08-16 13:59:06 -07:00
committed by vikerman
parent 62078eee45
commit a86c554a8e
21 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/@angular/compiler/core_private.ts
View File

@ -90,3 +90,5 @@ export var flattenStyles: typeof t.flattenStyles = r.flattenStyles;
export var clearStyles: typeof t.clearStyles = r.clearStyles;
export var collectAndResolveStyles: typeof r.collectAndResolveStyles = r.collectAndResolveStyles;
export var renderStyles: typeof t.renderStyles = r.renderStyles;
export type ViewMetadata = t.ViewMetadata;
export var ViewMetadata: typeof t.ViewMetadata = r.ViewMetadata;

3
modules/@angular/compiler/test/directive_resolver_mock_spec.ts
View File

@ -6,9 +6,10 @@
* found in the LICENSE file at https://angular.io/license
*/
import {Component, ComponentMetadata, Injector, ViewMetadata} from '@angular/core';
import {Component, ComponentMetadata, Injector} from '@angular/core';
import {beforeEach, ddescribe, describe, expect, iit, inject, it} from '@angular/core/testing/testing_internal';
import {ViewMetadata} from '../core_private';
import {isBlank, stringify} from '../src/facade/lang';
import {MockDirectiveResolver} from '../testing';

3
modules/@angular/compiler/test/runtime_compiler_spec.ts
View File

@ -8,11 +8,12 @@
import {DirectiveResolver, XHR} from '@angular/compiler';
import {MockDirectiveResolver} from '@angular/compiler/testing';
import {Compiler, Component, ComponentFactory, Injectable, Injector, Input, NgModule, NgModuleFactory, Type, ViewMetadata} from '@angular/core';
import {Compiler, Component, ComponentFactory, Injectable, Injector, Input, NgModule, NgModuleFactory, Type} from '@angular/core';
import {ComponentFixture, TestBed, fakeAsync, tick} from '@angular/core/testing';
import {TestComponentBuilder, beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
import {expect} from '@angular/platform-browser/testing/matchers';
import {ViewMetadata} from '../core_private';
import {stringify} from '../src/facade/lang';
import {SpyXHR} from './spies';

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

@ -7,12 +7,14 @@
*/
import {NgIf} from '@angular/common';
import {Component, Injectable, Input, NgModule, Pipe, ViewMetadata} from '@angular/core';
import {Component, Injectable, Input, NgModule, Pipe} from '@angular/core';
import {ComponentFixtureAutoDetect, ComponentFixtureNoNgZone, withModule} from '@angular/core/testing';
import {AsyncTestCompleter, TestComponentBuilder, beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
import {dispatchEvent} from '@angular/platform-browser/testing/browser_util';
import {expect} from '@angular/platform-browser/testing/matchers';
import {ViewMetadata} from '../core_private';
@Component(
{selector: 'child-comp', template: `<span>Original {{childBinding}}</span>`, directives: []})
@Injectable()

3
modules/@angular/compiler/testing/directive_resolver_mock.ts
View File

@ -6,7 +6,8 @@
* found in the LICENSE file at https://angular.io/license
*/
import {AnimationEntryMetadata, Compiler, ComponentMetadata, DirectiveMetadata, Injectable, Injector, Type, ViewMetadata, resolveForwardRef} from '@angular/core';
import {AnimationEntryMetadata, Compiler, ComponentMetadata, DirectiveMetadata, Injectable, Injector, Type, resolveForwardRef} from '@angular/core';
import {ViewMetadata} from '../core_private';
import {DirectiveResolver} from '../src/directive_resolver';
import {Map} from '../src/facade/collection';

17
modules/@angular/compiler/testing/test_component_builder.ts
View File

@ -6,9 +6,12 @@
* found in the LICENSE file at https://angular.io/license
*/
import {AnimationEntryMetadata, Compiler, ComponentFactory, Inject, Injectable, Injector, NgZone, Type, ViewMetadata} from '@angular/core';
import {AnimationEntryMetadata, Compiler, ComponentFactory, Inject, Injectable, Injector, NgZone, Type} from '@angular/core';
import {ComponentFixture, ComponentFixtureNoNgZone, TestBed} from '@angular/core/testing';
import {ViewMetadata} from '../core_private';
import {TestComponentBuilder} from '../core_private_testing';
// export {ViewMetadata} from '../core_private';
import {DirectiveResolver} from '../index';
import {MapWrapper} from '../src/facade/collection';
@ -25,17 +28,17 @@ import {isPresent} from '../src/facade/lang';
@Injectable()
export class OverridingTestComponentBuilder extends TestComponentBuilder {
/** @internal */
_bindingsOverrides = new Map<Type<any>, any[]>();
private _bindingsOverrides = new Map<Type<any>, any[]>();
/** @internal */
_directiveOverrides = new Map<Type<any>, Map<Type<any>, Type<any>>>();
private _directiveOverrides = new Map<Type<any>, Map<Type<any>, Type<any>>>();
/** @internal */
_templateOverrides = new Map<Type<any>, string>();
private _templateOverrides = new Map<Type<any>, string>();
/** @internal */
_animationOverrides = new Map<Type<any>, AnimationEntryMetadata[]>();
private _animationOverrides = new Map<Type<any>, AnimationEntryMetadata[]>();
/** @internal */
_viewBindingsOverrides = new Map<Type<any>, any[]>();
private _viewBindingsOverrides = new Map<Type<any>, any[]>();
/** @internal */
_viewOverrides = new Map<Type<any>, ViewMetadata>();
private _viewOverrides = new Map<Type<any>, ViewMetadata>();
constructor(@Inject(TestBed) injector: Injector) { super(injector); }