Skip to content

Commit

Permalink
Update Chromedriver to 76 (#35272)
Browse files Browse the repository at this point in the history
  • Loading branch information
bsessions85 authored and getdave committed Aug 13, 2019
1 parent ba5fc6a commit 1a4b405
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 62 deletions.
36 changes: 1 addition & 35 deletions test/e2e/lib/driver-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ export async function startBrowser( { useCustomUA = true, resizeBrowserWindow =
} );
options.setProxy( getProxyType() );
options.addArguments( '--no-first-run' );
options.addArguments( getChromeWindowSize( screenSize ) );

if ( useCustomUA ) {
options.addArguments(
Expand Down Expand Up @@ -207,7 +206,7 @@ export async function startBrowser( { useCustomUA = true, resizeBrowserWindow =
await driver
.manage()
.setTimeouts( { implicit: webDriverImplicitTimeOutMS, pageLoad: webDriverPageLoadTimeOutMS } );
if ( resizeBrowserWindow && browser.toLowerCase() !== 'chrome' ) {
if ( resizeBrowserWindow ) {
await resizeBrowser( driver, screenSize );
}

Expand Down Expand Up @@ -257,39 +256,6 @@ export async function resizeBrowser( driver, screenSize ) {
}
}

export function getChromeWindowSize( screenSize ) {
let windowSize;
if ( typeof screenSize === 'string' ) {
switch ( screenSize.toLowerCase() ) {
case 'mobile':
windowSize = '--window-size=400,1000';
break;
case 'tablet':
windowSize = '--window-size=1024,1000';
break;
case 'desktop':
windowSize = '--window-size=1440,1000';
break;
case 'laptop':
windowSize = '--window-size=1400,790';
break;
default:
throw new Error(
'Unsupported screen size specified (' +
screenSize +
'). Supported values are desktop, tablet and mobile.'
);
}
} else {
throw new Error(
'Unsupported screen size specified (' +
screenSize +
'). Supported values are desktop, tablet and mobile.'
);
}
return windowSize;
}

export async function clearCookiesAndDeleteLocalStorage( driver, siteURL = null ) {
if ( siteURL ) {
await driver.get( siteURL );
Expand Down
80 changes: 54 additions & 26 deletions test/e2e/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@babel/runtime": "7.3.1",
"asana-phrase": "0.0.8",
"cached-path-relative": ">=1.0.2",
"chromedriver": "^74.0.0",
"chromedriver": "^76.0.0",
"concurrently": "^3.6.1",
"config": "1.28.0",
"cryptiles": ">=4.1.2",
Expand Down

0 comments on commit 1a4b405

Please sign in to comment.