Skip to content
This repository has been archived by the owner on Jul 29, 2024. It is now read-only.

deps(webdriver_js_extender): update webdriver_js_extender to 2.0 #4882

Merged
merged 1 commit into from
Jul 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/debugger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ export class DebugHelper {
},
(err: string) => {
console.error(err);
process.exit(1);
return process.exit(1) as never;
});
}

Expand Down
2 changes: 1 addition & 1 deletion lib/driverProviders/driverProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export abstract class DriverProvider {
if (this.config_.disableEnvironmentOverrides === true) {
builder.disableEnvironmentOverrides();
}
let newDriver = builder.build();
let newDriver = builder.build() as WebDriver;
this.drivers_.push(newDriver);
return newDriver;
}
Expand Down
1 change: 0 additions & 1 deletion lib/driverProviders/mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/
import * as q from 'q';
import {Session, WebDriver} from 'selenium-webdriver';
import * as executors from 'selenium-webdriver/executors';

import {Config} from '../config';
import {DriverProvider} from './driverProvider';
Expand Down
82 changes: 12 additions & 70 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@types/node": "^6.0.46",
"@types/q": "^0.0.32",
"@types/selenium-webdriver": "~2.53.39",
"@types/selenium-webdriver": "^3.0.0",
"blocking-proxy": "^1.0.0",
"browserstack": "^1.5.1",
"chalk": "^1.1.3",
Expand All @@ -26,7 +26,7 @@
"saucelabs": "^1.5.0",
"selenium-webdriver": "3.6.0",
"source-map-support": "~0.4.0",
"webdriver-js-extender": "^1.0.0",
"webdriver-js-extender": "2.0.0",
"webdriver-manager": "^12.0.6"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions scripts/errorTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var checkLogs = function(output, messages) {
for (var pos in messages) {
var message = messages[pos];
if (output.indexOf(message) === -1) {
throw new Error('does not exist in logs: ' + message);
throw new Error('\'' + message + '\'' + ' does not exist in logs: ' + output);
}
}
};
Expand All @@ -23,7 +23,7 @@ var checkLogs = function(output, messages) {
runProtractor = spawn('node',
['bin/protractor', 'spec/errorTest/sauceLabsAuthentication.js']);
output = runProtractor.stdout.toString();
messages = ['WebDriverError: Misconfigured -- Sauce Labs Authentication Error.',
messages = ['Sauce Labs Authentication Error.',
'Process exited with error code ' + exitCodes.BrowserError.CODE];
checkLogs(output, messages);

Expand Down
4 changes: 2 additions & 2 deletions spec/ng2/async_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ describe('async angular2 application', function() {
// still be 0.
expect(timeout.$('.val').getText()).toEqual('0');

browser.ignoreSynchronization = true;
browser.waitForAngularEnabled(false);

timeout.$('.action').click();
timeout.$('.cancel').click();

browser.ignoreSynchronization = false;
browser.waitForAngularEnabled(true);

// whenStable should be called since the async action is cancelled. The
// count should still be 0;
Expand Down