Skip to content

Commit

Permalink
remove legacy SafariDriver references in lib/test (#2839)
Browse files Browse the repository at this point in the history
  • Loading branch information
oddui authored and jleyba committed Sep 30, 2016
1 parent e97639b commit 36d5777
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions javascript/node/selenium-webdriver/lib/test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ var build = require('./build'),


const LEGACY_FIREFOX = 'legacy-' + webdriver.Browser.FIREFOX;
const LEGACY_SAFARI = 'legacy-' + webdriver.Browser.SAFARI;


/**
Expand All @@ -46,8 +45,7 @@ var NATIVE_BROWSERS = [
webdriver.Browser.IE,
webdriver.Browser.OPERA,
webdriver.Browser.PHANTOM_JS,
webdriver.Browser.SAFARI,
LEGACY_SAFARI
webdriver.Browser.SAFARI
];


Expand Down Expand Up @@ -83,8 +81,7 @@ var browsersToTest = (function() {
parts[0] = webdriver.Browser.IE;
}

if (parts[0] === LEGACY_FIREFOX ||
parts[0] === LEGACY_SAFARI) {
if (parts[0] === LEGACY_FIREFOX) {
return;
}

Expand Down Expand Up @@ -175,14 +172,6 @@ function TestEnvironment(browserName, server) {
parts[0] = webdriver.Browser.FIREFOX;
}

if (parts[0] === LEGACY_SAFARI) {
var options = builder.getSafariOptions() || new safari.Options();
options.useLegacyDriver(true);
builder.setSafariOptions(options);

parts[0] = webdriver.Browser.SAFARI;
}

builder.forBrowser(parts[0], parts[1], parts[2]);
if (server) {
builder.usingServer(server.address());
Expand Down Expand Up @@ -243,11 +232,6 @@ function suite(fn, opt_options) {
return build.of('//javascript/firefox-driver:webdriver')
.onlyOnce().go();
});
} else if (browser === LEGACY_SAFARI) {
testing.before(function() {
return build.of('//javascript/safari-driver:client')
.onlyOnce().go();
});
}
}

Expand Down

0 comments on commit 36d5777

Please sign in to comment.