2016-10-19 16:41:04 -04:00
|
|
|
/**
|
|
|
|
* @license
|
|
|
|
* Copyright Google Inc. All Rights Reserved.
|
|
|
|
*
|
|
|
|
* Use of this source code is governed by an MIT-style license that can be
|
|
|
|
* found in the LICENSE file at https://angular.io/license
|
|
|
|
*/
|
|
|
|
|
2017-01-20 11:38:14 -05:00
|
|
|
import {Component, Directive, ElementRef, Injector, Input, NgModule, NgZone, SimpleChange, SimpleChanges, destroyPlatform} from '@angular/core';
|
2016-10-19 16:41:04 -04:00
|
|
|
import {async} from '@angular/core/testing';
|
|
|
|
import {BrowserModule} from '@angular/platform-browser';
|
|
|
|
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
feat(upgrade): return a function (instead of array) from `downgradeInjectable()` (#14037)
This makes it more consistent with the dynamic version of `upgrade` and makes it
possible to share code between the dynamic and static versions.
This commit also refactors the file layout, moving common and dynamic-specific
files to `common/` and `dynamic/` directories respectively and renaming `aot/`
to `static/`.
Some private keys, used as AngularJS DI tokens, have also been renamed, but this
should not affect apps, since these keys are undocumented and not supposed to
be used externally.
BREAKING CHANGE:
Previously, `upgrade/static/downgradeInjectable` returned an array of the form:
```js
['dep1', 'dep2', ..., function factory(dep1, dep2, ...) { ... }]
```
Now it returns a function with an `$inject` property:
```js
factory.$inject = ['dep1', 'dep2', ...];
function factory(dep1, dep2, ...) { ... }
```
It shouldn't affect the behavior of apps, since both forms are equally suitable
to be used for registering AngularJS injectable services, but it is possible
that type-checking might fail or that current code breaks if it relies on the
returned value being an array.
2017-01-13 09:20:28 -05:00
|
|
|
import * as angular from '@angular/upgrade/src/common/angular1';
|
2016-10-20 22:35:35 -04:00
|
|
|
import {UpgradeComponent, UpgradeModule, downgradeComponent} from '@angular/upgrade/static';
|
2016-10-19 16:41:04 -04:00
|
|
|
|
|
|
|
import {bootstrap, html} from '../test_helpers';
|
|
|
|
|
|
|
|
export function main() {
|
|
|
|
describe('scope/component change-detection', () => {
|
|
|
|
beforeEach(() => destroyPlatform());
|
|
|
|
afterEach(() => destroyPlatform());
|
|
|
|
|
|
|
|
it('should interleave scope and component expressions', async(() => {
|
|
|
|
const log: any[] /** TODO #9100 */ = [];
|
|
|
|
const l = (value: any /** TODO #9100 */) => {
|
|
|
|
log.push(value);
|
|
|
|
return value + ';';
|
|
|
|
};
|
|
|
|
|
|
|
|
@Directive({selector: 'ng1a'})
|
|
|
|
class Ng1aComponent extends UpgradeComponent {
|
|
|
|
constructor(elementRef: ElementRef, injector: Injector) {
|
|
|
|
super('ng1a', elementRef, injector);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@Directive({selector: 'ng1b'})
|
|
|
|
class Ng1bComponent extends UpgradeComponent {
|
|
|
|
constructor(elementRef: ElementRef, injector: Injector) {
|
|
|
|
super('ng1b', elementRef, injector);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'ng2',
|
|
|
|
template: `{{l('2A')}}<ng1a></ng1a>{{l('2B')}}<ng1b></ng1b>{{l('2C')}}`
|
|
|
|
})
|
|
|
|
class Ng2Component {
|
|
|
|
l: (value: any) => string;
|
|
|
|
constructor() { this.l = l; }
|
|
|
|
}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [Ng1aComponent, Ng1bComponent, Ng2Component],
|
|
|
|
entryComponents: [Ng2Component],
|
|
|
|
imports: [BrowserModule, UpgradeModule]
|
|
|
|
})
|
|
|
|
class Ng2Module {
|
|
|
|
ngDoBootstrap() {}
|
|
|
|
}
|
|
|
|
|
|
|
|
const ng1Module = angular.module('ng1', [])
|
|
|
|
.directive('ng1a', () => ({template: '{{ l(\'ng1a\') }}'}))
|
|
|
|
.directive('ng1b', () => ({template: '{{ l(\'ng1b\') }}'}))
|
|
|
|
.directive('ng2', downgradeComponent({component: Ng2Component}))
|
|
|
|
.run(($rootScope: any /** TODO #9100 */) => {
|
|
|
|
$rootScope.l = l;
|
|
|
|
$rootScope.reset = () => log.length = 0;
|
|
|
|
});
|
|
|
|
|
|
|
|
const element =
|
|
|
|
html('<div>{{reset(); l(\'1A\');}}<ng2>{{l(\'1B\')}}</ng2>{{l(\'1C\')}}</div>');
|
|
|
|
bootstrap(platformBrowserDynamic(), Ng2Module, element, ng1Module).then((upgrade) => {
|
|
|
|
expect(document.body.textContent).toEqual('1A;2A;ng1a;2B;ng1b;2C;1C;');
|
|
|
|
// https://github.com/angular/angular.js/issues/12983
|
2017-03-15 16:22:54 -04:00
|
|
|
expect(log).toEqual(['1A', '1B', '1C', '2A', '2B', '2C', 'ng1a', 'ng1b']);
|
2016-10-19 16:41:04 -04:00
|
|
|
});
|
|
|
|
}));
|
2017-01-20 11:38:14 -05:00
|
|
|
|
|
|
|
it('should propagate changes to a downgraded component inside the ngZone', async(() => {
|
|
|
|
let appComponent: AppComponent;
|
|
|
|
|
|
|
|
@Component({selector: 'my-app', template: '<my-child [value]="value"></my-child>'})
|
|
|
|
class AppComponent {
|
|
|
|
value: number;
|
|
|
|
constructor() { appComponent = this; }
|
|
|
|
}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'my-child',
|
|
|
|
template: '<div>{{valueFromPromise}}',
|
|
|
|
})
|
|
|
|
class ChildComponent {
|
|
|
|
valueFromPromise: number;
|
|
|
|
@Input()
|
|
|
|
set value(v: number) { expect(NgZone.isInAngularZone()).toBe(true); }
|
|
|
|
|
|
|
|
constructor(private zone: NgZone) {}
|
|
|
|
|
|
|
|
ngOnChanges(changes: SimpleChanges) {
|
|
|
|
if (changes['value'].isFirstChange()) return;
|
|
|
|
|
|
|
|
this.zone.onMicrotaskEmpty.subscribe(
|
|
|
|
() => { expect(element.textContent).toEqual('5'); });
|
|
|
|
|
|
|
|
Promise.resolve().then(() => this.valueFromPromise = changes['value'].currentValue);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [AppComponent, ChildComponent],
|
|
|
|
entryComponents: [AppComponent],
|
|
|
|
imports: [BrowserModule, UpgradeModule]
|
|
|
|
})
|
|
|
|
class Ng2Module {
|
|
|
|
ngDoBootstrap() {}
|
|
|
|
}
|
|
|
|
|
|
|
|
const ng1Module = angular.module('ng1', []).directive(
|
|
|
|
'myApp', downgradeComponent({component: AppComponent}));
|
|
|
|
|
|
|
|
|
|
|
|
const element = html('<my-app></my-app>');
|
|
|
|
|
|
|
|
bootstrap(platformBrowserDynamic(), Ng2Module, element, ng1Module).then((upgrade) => {
|
|
|
|
appComponent.value = 5;
|
|
|
|
});
|
|
|
|
}));
|
|
|
|
|
|
|
|
// This test demonstrates https://github.com/angular/angular/issues/6385
|
|
|
|
// which was invalidly fixed by https://github.com/angular/angular/pull/6386
|
|
|
|
// it('should not trigger $digest from an async operation in a watcher', async(() => {
|
|
|
|
// @Component({selector: 'my-app', template: ''})
|
|
|
|
// class AppComponent {
|
|
|
|
// }
|
|
|
|
|
|
|
|
// @NgModule({declarations: [AppComponent], imports: [BrowserModule]})
|
|
|
|
// class Ng2Module {
|
|
|
|
// }
|
|
|
|
|
|
|
|
// const adapter: UpgradeAdapter = new UpgradeAdapter(forwardRef(() => Ng2Module));
|
|
|
|
// const ng1Module = angular.module('ng1', []).directive(
|
|
|
|
// 'myApp', adapter.downgradeNg2Component(AppComponent));
|
|
|
|
|
|
|
|
// const element = html('<my-app></my-app>');
|
|
|
|
|
|
|
|
// adapter.bootstrap(element, ['ng1']).ready((ref) => {
|
|
|
|
// let doTimeout = false;
|
|
|
|
// let timeoutId: number;
|
|
|
|
// ref.ng1RootScope.$watch(() => {
|
|
|
|
// if (doTimeout && !timeoutId) {
|
|
|
|
// timeoutId = window.setTimeout(function() {
|
|
|
|
// timeoutId = null;
|
|
|
|
// }, 10);
|
|
|
|
// }
|
|
|
|
// });
|
|
|
|
// doTimeout = true;
|
|
|
|
// });
|
|
|
|
// }));
|
2016-10-19 16:41:04 -04:00
|
|
|
});
|
2016-10-20 22:35:35 -04:00
|
|
|
}
|