Skip to content

Commit aab961d

Browse files
mheverymhevery
committed
WIP: in middle of testing; files moved, imports broken
1 parent 79ba0ec commit aab961d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+233
-266
lines changed

‎modules/@angular/common/common.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export 'index.dart';

‎modules/@angular/common/common.ts‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎modules/@angular/common/index.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
export * from './common';
1+
export * from './src/pipes';
2+
export * from './src/directives';
3+
export * from './src/forms';
4+
export * from './src/common_directives';
5+
export * from './src/location';

‎modules/@angular/common/test/forms/integration_spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
iit,
1818
xit,
1919
browserDetection
20-
} from '@angular/testing/testing_internal';
20+
} from '@angular/core/testing';
2121

2222
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
2323
import {

‎modules/@angular/common/testing.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export {MockLocationStrategy} from './testing/mock_location_strategy';
2+
export {SpyLocation} from './testing/location_mock';

modules/@angular/testing/src/mock/location_mock.ts renamed to modules/@angular/common/testing/location_mock.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {Injectable} from '@angular/core';
2-
import {EventEmitter, ObservableWrapper} from '../../src/facade/async';
3-
import {Location} from '@angular/common';
1+
import {Injectable, EventEmitter} from '@angular/core';
2+
import {ObservableWrapper} from '../../core-testing/src/facade/async';
3+
import {Location} from '..';
44

55
/**
66
* A spy for {@link Location} that allows tests to fire simulated location events.

modules/@angular/testing/src/mock/mock_location_strategy.ts renamed to modules/@angular/common/testing/mock_location_strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Injectable} from '@angular/core';
2-
import {EventEmitter, ObservableWrapper} from '../../src/facade/async';
2+
import {EventEmitter, ObservableWrapper} from '../src/facade/async';
33
import {LocationStrategy} from '@angular/common';
44

55

modules/@angular/testing/test/mock/view_resolver_mock_spec.ts renamed to modules/@angular/compiler/test/view_resolver_mock_spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import {
66
expect,
77
iit,
88
it,
9-
} from '@angular/testing/testing_internal';
9+
} from '../../core/testing';
1010

11-
import {stringify} from '../../src/facade/lang';
11+
import {stringify} from '../../core-testing/src/facade/lang';
1212

13-
import {MockViewResolver} from '@angular/testing';
13+
import {MockViewResolver} from '../../core/testing';
1414

15-
import {Component, ViewMetadata} from '@angular/core/src/metadata';
15+
import {Component, ViewMetadata} from '../../core/src/metadata';
1616

17-
import {isBlank} from '../../src/facade/lang';
17+
import {isBlank} from '../../core-testing/src/facade/lang';
1818

1919
export function main() {
2020
describe('MockViewResolver', () => {

modules/@angular/testing/src/mock/schema_registry_mock.ts renamed to modules/@angular/compiler/testing/schema_registry_mock.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {isPresent} from '../../src/facade/lang';
2-
import {ElementSchemaRegistry} from '@angular/compiler';
1+
import {isPresent} from '../../core-testing/src/facade/lang';
2+
import {ElementSchemaRegistry} from '.';
33

44
export class MockSchemaRegistry implements ElementSchemaRegistry {
55
constructor(public existingProperties: {[key: string]: boolean},

modules/@angular/testing/src/mock/view_resolver_mock.ts renamed to modules/@angular/compiler/testing/view_resolver_mock.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import {Injectable, ViewMetadata} from '@angular/core';
2-
import {ViewResolver} from '@angular/compiler';
3-
import {Map, ListWrapper} from '../../src/facade/collection';
4-
import {Type, isPresent, stringify, isBlank} from '../../src/facade/lang';
5-
import {BaseException} from '../../src/facade/exceptions';
1+
import {Injectable, ViewMetadata} from '../.';
2+
import {ViewResolver} from '.';
3+
import {Map, ListWrapper} from '../../core-testing/src/facade/collection';
4+
import {Type, isPresent, stringify, isBlank} from '../../core-testing/src/facade/lang';
5+
import {BaseException} from '../../core-testing/src/facade/exceptions';
66

77
@Injectable()
88
export class MockViewResolver extends ViewResolver {

0 commit comments

Comments
 (0)