diff --git a/packages/schematics/angular/e2e/files/protractor.conf.js.template b/packages/schematics/angular/e2e/files/protractor.conf.js.template index f238c0bbeb..361e7f0cdf 100644 --- a/packages/schematics/angular/e2e/files/protractor.conf.js.template +++ b/packages/schematics/angular/e2e/files/protractor.conf.js.template @@ -16,6 +16,7 @@ exports.config = { browserName: 'chrome' }, directConnect: true, + SELENIUM_PROMISE_MANAGER: false, baseUrl: 'http://localhost:4200/', framework: 'jasmine', jasmineNodeOpts: { diff --git a/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts.template b/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts.template index 06f874bf13..ff74d504d2 100644 --- a/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts.template +++ b/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts.template @@ -8,9 +8,9 @@ describe('workspace-project App', () => { page = new AppPage(); }); - it('should display welcome message', () => { - page.navigateTo(); - expect(page.getTitleText()).toEqual('<%= relatedAppName %> app is running!'); + it('should display welcome message', async () => { + await page.navigateTo(); + expect(await page.getTitleText()).toEqual('<%= relatedAppName %> app is running!'); }); afterEach(async () => { 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 61b39d9a06..16143fc955 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 { - return browser.get(browser.baseUrl) as Promise; + async navigateTo(): Promise { + return browser.get(browser.baseUrl); } - getTitleText(): Promise { - return element(by.css('<%= rootSelector %> .content span')).getText() as Promise; + async getTitleText(): Promise { + return element(by.css('<%= rootSelector %> .content span')).getText(); } } diff --git a/packages/schematics/angular/e2e/files/tsconfig.json.template b/packages/schematics/angular/e2e/files/tsconfig.json.template index 61594f0058..64fe9862db 100644 --- a/packages/schematics/angular/e2e/files/tsconfig.json.template +++ b/packages/schematics/angular/e2e/files/tsconfig.json.template @@ -7,7 +7,6 @@ "target": "es2018", "types": [ "jasmine", - "jasminewd2", "node" ] } diff --git a/packages/schematics/angular/workspace/files/package.json.template b/packages/schematics/angular/workspace/files/package.json.template index c1bcd75259..9e7825f8bc 100644 --- a/packages/schematics/angular/workspace/files/package.json.template +++ b/packages/schematics/angular/workspace/files/package.json.template @@ -25,8 +25,7 @@ "devDependencies": { "@angular/cli": "<%= '~' + version %>", "@angular/compiler-cli": "<%= latestVersions.Angular %>",<% if (!minimal) { %> - "@types/jasmine": "~3.5.0", - "@types/jasminewd2": "~2.0.3",<% } %> + "@types/jasmine": "~3.5.0",<% } %> "@types/node": "^12.11.1",<% if (!minimal) { %> "codelyzer": "^6.0.0", "jasmine-core": "~3.6.0",