Skip to content

Commit 4ab6f30

Browse files
devversiontinayuangao
authored andcommitted
chore(e2e): update to latest protractor version (#2608)
* chore(e2e): update to latest protractor version * Updates to the latest Protractor version, which now uses Selenium V3 * The new types for Protractor v5 include the fix for the missing `chord` function (See DefinitelyTyped/DefinitelyTyped@123690b) * Methods like `innerHtml` have been removed in Protractor v5 (https://github.com/angular/protractor/blob/master/CHANGELOG.md) * Test later chromedriver version
1 parent 7727387 commit 4ab6f30

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@
3333
npm-debug.log
3434
testem.log
3535
/.chrome
36+
yarn.lock

e2e/components/dialog/dialog.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,6 @@ describe('dialog', () => {
102102

103103
// TODO(crisbeto): should be moved to a common util. copied from the menu e2e setup.
104104
function expectFocusOn(el: any): void {
105-
expect(browser.driver.switchTo().activeElement().getInnerHtml()).toBe(el.getInnerHtml());
105+
expect(browser.driver.switchTo().activeElement().getId()).toBe(el.getId());
106106
}
107107
});

e2e/components/menu/menu-page.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ export class MenuPage {
3939

4040
// TODO(kara): move to common testing utility
4141
expectFocusOn(el: any): void {
42-
expect(browser.driver.switchTo().activeElement().getInnerHtml())
43-
.toBe(el.getInnerHtml());
42+
expect(browser.driver.switchTo().activeElement().getId()).toBe(el.getId());
4443
}
4544

4645
expectMenuPresent(expected: boolean) {

package.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,10 @@
4848
"@types/merge2": "0.0.28",
4949
"@types/minimist": "^1.1.28",
5050
"@types/node": "^6.0.34",
51-
"@types/protractor": "^4.0.0",
5251
"@types/run-sequence": "0.0.27",
5352
"@types/rx": "^2.5.33",
54-
"@types/selenium-webdriver": "2.53.36",
5553
"axe-core": "^2.0.7",
56-
"axe-webdriverjs": "^0.4.0",
54+
"axe-webdriverjs": "^0.5.0",
5755
"conventional-changelog": "^1.1.0",
5856
"dgeni": "^0.4.2",
5957
"dgeni-packages": "^0.16.2",
@@ -91,16 +89,16 @@
9189
"merge2": "^1.0.2",
9290
"minimist": "^1.2.0",
9391
"node-sass": "^3.4.2",
94-
"protractor": "^4.0.8",
92+
"protractor": "^5.0.0",
9593
"resolve-bin": "^0.4.0",
9694
"run-sequence": "^1.2.2",
9795
"sass": "^0.5.0",
98-
"selenium-webdriver": "2.53.3",
96+
"selenium-webdriver": "^3.0.1",
9997
"strip-ansi": "^3.0.0",
10098
"stylelint": "^7.7.0",
10199
"symlink-or-copy": "^1.0.1",
102100
"travis-after-modes": "0.0.7",
103-
"ts-node": "^0.7.3",
101+
"ts-node": "^2.0.0",
104102
"tslint": "^3.13.0",
105103
"typedoc": "^0.5.1",
106104
"typescript": "~2.0.10",

test/protractor.conf.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ if (process.env['TRAVIS']) {
4141
config.sauceKey = key;
4242
config.capabilities = {
4343
'browserName': 'chrome',
44+
'version': 'latest',
45+
"chromedriverVersion": "2.26",
4446
'tunnel-identifier': process.env['TRAVIS_JOB_ID'],
4547
'build': process.env['TRAVIS_JOB_ID'],
4648
'name': 'Material 2 E2E Tests',
@@ -53,11 +55,6 @@ if (process.env['TRAVIS']) {
5355
'recordVideo': false,
5456
'recordScreenshots': false
5557
};
56-
57-
// Because Protractor runs selenium instances concurrently in the CI and each instance
58-
// will create a bloat of logs we don't want to show any info messages.
59-
// Until protractor#1451 is solved, manually disable all info messages.
60-
require('protractor/built/logger').Logger.prototype.info = () => {};
6158
}
6259

6360

0 commit comments

Comments
 (0)