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

test(ivy): turn on passing tests in platform-browser-dynamic (#28307)

Browse Source 
PR Close #28307
This commit is contained in:
Kara Erickson 2019-01-22 18:18:45 -08:00 committed by Jason Aden
parent f9b103825a
commit 317cc922ac
2 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts
View File

@ -12,7 +12,6 @@ import {TestBed, async, fakeAsync, tick} from '@angular/core/testing';
import {CachedResourceLoader} from '@angular/platform-browser-dynamic/src/resource_loader/resource_loader_cache'; import {CachedResourceLoader} from '@angular/platform-browser-dynamic/src/resource_loader/resource_loader_cache';
import {setTemplateCache} from '@angular/platform-browser-dynamic/test/resource_loader/resource_loader_cache_setter'; import {setTemplateCache} from '@angular/platform-browser-dynamic/test/resource_loader/resource_loader_cache_setter';
import {expect} from '@angular/platform-browser/testing/src/matchers'; import {expect} from '@angular/platform-browser/testing/src/matchers';
import {fixmeIvy} from '@angular/private/testing';
if (isBrowser) { if (isBrowser) {
describe('CachedResourceLoader', () => { describe('CachedResourceLoader', () => {
@ -54,20 +53,19 @@ if (isBrowser) {
.catch((error) => {/** success */}); .catch((error) => {/** success */});
})); }));
fixmeIvy('FW-553: TestBed is unaware of async compilation') it('should allow fakeAsync Tests to load components with templateUrl synchronously',
.it('should allow fakeAsync Tests to load components with templateUrl synchronously', fakeAsync(() => {
fakeAsync(() => { TestBed.configureTestingModule({declarations: [TestComponent]});
TestBed.configureTestingModule({declarations: [TestComponent]}); TestBed.compileComponents();
TestBed.compileComponents(); tick();
tick();
const fixture = TestBed.createComponent(TestComponent); const fixture = TestBed.createComponent(TestComponent);
// This should initialize the fixture. // This should initialize the fixture.
tick(); tick();
expect(fixture.debugElement.children[0].nativeElement).toHaveText('Hello'); expect(fixture.debugElement.children[0].nativeElement).toHaveText('Hello');
})); }));
}); });
} }

58
packages/platform-browser-dynamic/test/testing_public_browser_spec.ts
View File

@ -11,7 +11,6 @@ import {Compiler, Component, NgModule} from '@angular/core';
import {TestBed, async, fakeAsync, inject, tick} from '@angular/core/testing'; import {TestBed, async, fakeAsync, inject, tick} from '@angular/core/testing';
import {ResourceLoaderImpl} from '@angular/platform-browser-dynamic/src/resource_loader/resource_loader_impl'; import {ResourceLoaderImpl} from '@angular/platform-browser-dynamic/src/resource_loader/resource_loader_impl';
import {fixmeIvy} from '@angular/private/testing';
@ -116,41 +115,38 @@ if (isBrowser) {
const restoreJasmineIt = () => { jasmine.getEnv().it = originalJasmineIt; }; const restoreJasmineIt = () => { jasmine.getEnv().it = originalJasmineIt; };
fixmeIvy('FW-553: TestBed is unaware of async compilation') it('should fail when an ResourceLoader fails', done => {
.it('should fail when an ResourceLoader fails', done => { const itPromise = patchJasmineIt();
const itPromise = patchJasmineIt();
it('should fail with an error from a promise', async(() => { it('should fail with an error from a promise', async(() => {
TestBed.configureTestingModule({declarations: [BadTemplateUrl]}); TestBed.configureTestingModule({declarations: [BadTemplateUrl]});
TestBed.compileComponents(); TestBed.compileComponents();
})); }));
itPromise.then( itPromise.then(
() => { done.fail('Expected test to fail, but it did not'); }, () => { done.fail('Expected test to fail, but it did not'); },
(err: any) => { (err: any) => {
expect(err.message) expect(err.message)
.toEqual('Uncaught (in promise): Failed to load non-existent.html'); .toEqual('Uncaught (in promise): Failed to load non-existent.html');
done(); done();
}); });
restoreJasmineIt(); restoreJasmineIt();
}, 10000); }, 10000);
}); });
describe('TestBed createComponent', function() { describe('TestBed createComponent', function() {
fixmeIvy('FW-553: TestBed is unaware of async compilation') it('should allow an external templateUrl', async(() => {
.it('should allow an external templateUrl', async(() => { TestBed.configureTestingModule({declarations: [ExternalTemplateComp]});
TestBed.configureTestingModule({declarations: [ExternalTemplateComp]}); TestBed.compileComponents().then(() => {
TestBed.compileComponents().then(() => { const componentFixture = TestBed.createComponent(ExternalTemplateComp);
const componentFixture = TestBed.createComponent(ExternalTemplateComp); componentFixture.detectChanges();
componentFixture.detectChanges(); expect(componentFixture.nativeElement.textContent).toEqual('from external template');
expect(componentFixture.nativeElement.textContent) });
.toEqual('from external template'); }),
}); 10000); // Long timeout here because this test makes an actual ResourceLoader
}), // request, and
10000); // Long timeout here because this test makes an actual ResourceLoader // is slow
// request, and // on Edge.
// is slow
// on Edge.
}); });
}); });
} }