From 6bfe728b428417bad21bd0cb68288001275a869e Mon Sep 17 00:00:00 2001 From: tim_frijters Date: Wed, 6 May 2020 17:02:55 +0200 Subject: [PATCH 1/2] fix(@angular/cli): Do not use floating promises, we can resolve these promises by returning them. --- .../application/other-files/app.component.spec.ts.template | 6 +++--- .../__name@dasherize__.__type@dasherize__.spec.ts.template | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/schematics/angular/application/other-files/app.component.spec.ts.template b/packages/schematics/angular/application/other-files/app.component.spec.ts.template index 08513f442052..af7941aa7e2b 100644 --- a/packages/schematics/angular/application/other-files/app.component.spec.ts.template +++ b/packages/schematics/angular/application/other-files/app.component.spec.ts.template @@ -3,8 +3,8 @@ import { RouterTestingModule } from '@angular/router/testing';<% } %> import { AppComponent } from './app.component'; describe('AppComponent', () => { - beforeEach(async(() => { - TestBed.configureTestingModule({<% if (routing) { %> + beforeEach(async () => { + return TestBed.configureTestingModule({<% if (routing) { %> imports: [ RouterTestingModule ],<% } %> @@ -12,7 +12,7 @@ describe('AppComponent', () => { AppComponent ], }).compileComponents(); - })); + }); it('should create the app', () => { const fixture = TestBed.createComponent(AppComponent); diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.spec.ts.template b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.spec.ts.template index 504f6c091efc..9fee2f788d50 100644 --- a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.spec.ts.template +++ b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.spec.ts.template @@ -6,12 +6,12 @@ describe('<%= classify(name) %><%= classify(type) %>', () => { let component: <%= classify(name) %><%= classify(type) %>; let fixture: ComponentFixture<<%= classify(name) %><%= classify(type) %>>; - beforeEach(async(() => { - TestBed.configureTestingModule({ + beforeEach(async () => { + return TestBed.configureTestingModule({ declarations: [ <%= classify(name) %><%= classify(type) %> ] }) .compileComponents(); - })); + }); beforeEach(() => { fixture = TestBed.createComponent(<%= classify(name) %><%= classify(type) %>); From b6f5bd4f75d9e1671c729d63972204c5d4bdb125 Mon Sep 17 00:00:00 2001 From: tim_frijters Date: Wed, 6 May 2020 17:16:50 +0200 Subject: [PATCH 2/2] fix(@angular/cli): Functions that return promises must be async --- packages/schematics/angular/e2e/files/src/app.po.ts.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/schematics/angular/e2e/files/src/app.po.ts.template b/packages/schematics/angular/e2e/files/src/app.po.ts.template index 61b39d9a066f..8dd0a8faa497 100644 --- a/packages/schematics/angular/e2e/files/src/app.po.ts.template +++ b/packages/schematics/angular/e2e/files/src/app.po.ts.template @@ -1,11 +1,11 @@ import { browser, by, element } from 'protractor'; export class AppPage { - navigateTo(): Promise { + async navigateTo(): Promise { return browser.get(browser.baseUrl) as Promise; } - getTitleText(): Promise { + async getTitleText(): Promise { return element(by.css('<%= rootSelector %> .content span')).getText() as Promise; } }