iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(ivy): enable last test in view injector integration spec (#27989) 

PR Close #27989
This commit is contained in:
Marc Laval 2019-01-08 16:10:43 +01:00 committed by Kara Erickson
parent 6e7c46af1b
commit c2f19515d6
1 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packages/core/test/linker/view_injector_integration_spec.ts
View File

@ -10,7 +10,7 @@ import {Attribute, ChangeDetectionStrategy, ChangeDetectorRef, Component, Compon
import {ComponentFixture, TestBed, fakeAsync} from '@angular/core/testing';
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
import {expect} from '@angular/platform-browser/testing/src/matchers';
import {fixmeIvy, modifiedInIvy, obsoleteInIvy, onlyInIvy} from '@angular/private/testing';
import {ivyEnabled, modifiedInIvy, obsoleteInIvy, onlyInIvy} from '@angular/private/testing';
@Directive({selector: '[simpleDirective]'})
class SimpleDirective {
@ -818,13 +818,9 @@ class TestComp {
expect(compEl.nativeElement).toHaveText('1');
});
fixmeIvy(
'FW-893: expect(changeDetectorRef).toEqual(otherChangeDetectorRef) creates an infinite loop')
.it('should inject ChangeDetectorRef of the containing component into directives', () => {
TestBed.configureTestingModule({
declarations:
[PushComponentNeedsChangeDetectorRef, DirectiveNeedsChangeDetectorRef]
});
it('should inject ChangeDetectorRef of the containing component into directives', () => {
TestBed.configureTestingModule(
{declarations: [PushComponentNeedsChangeDetectorRef, DirectiveNeedsChangeDetectorRef]});
TestBed.overrideComponent(PushComponentNeedsChangeDetectorRef, {
set: {
template:
@ -839,12 +835,29 @@ class TestComp {
comp.counter = 1;
cf.detectChanges();
expect(compEl.nativeElement).toHaveText('0');
expect(
compEl.children[0].injector.get(DirectiveNeedsChangeDetectorRef).changeDetectorRef)
.toEqual(comp.changeDetectorRef);
expect(
compEl.children[1].injector.get(DirectiveNeedsChangeDetectorRef).changeDetectorRef)
.toEqual(comp.changeDetectorRef);
/**
* Compares two `ChangeDetectorRef` instances. The logic depends on the engine, as the
* implementation details of `ViewRef` vary.
*/
function _compareChangeDetectorRefs(a: ChangeDetectorRef, b: ChangeDetectorRef) {
if (!ivyEnabled) {
// View Engine case
expect(a).toEqual(b);
} else {
// Ivy case
expect((a as any)._lView).toEqual((b as any)._lView);
expect((a as any).context).toEqual((b as any).context);
}
}
_compareChangeDetectorRefs(
compEl.children[0].injector.get(DirectiveNeedsChangeDetectorRef).changeDetectorRef,
comp.changeDetectorRef);
_compareChangeDetectorRefs(
compEl.children[1].injector.get(DirectiveNeedsChangeDetectorRef).changeDetectorRef,
comp.changeDetectorRef);
comp.changeDetectorRef.markForCheck();
cf.detectChanges();
expect(compEl.nativeElement).toHaveText('1');