1 files changed, 19 insertions, 24 deletions

diff --git a/node_modules/selenium-webdriver/lib/test/index.js b/node_modules/selenium-webdriver/lib/test/index.js
index d702c5fb2..ba34ddab4 100644
--- a/node_modules/selenium-webdriver/lib/test/index.js
+++ b/node_modules/selenium-webdriver/lib/test/index.js
@@ -31,7 +31,6 @@ var build = require('./build'),
 
 
 const LEGACY_FIREFOX = 'legacy-' + webdriver.Browser.FIREFOX;
-const LEGACY_SAFARI = 'legacy-' + webdriver.Browser.SAFARI;
 
 
 /**
@@ -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
 ];
 
 
@@ -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;
     }
 
@@ -117,6 +114,8 @@ var browsersToTest = (function() {
       console.log('Running tests using loopback address')
     }
   }
+  console.log(
+      'Promise manager is enabled? ' + webdriver.promise.USE_PROMISE_MANAGER);
 
   return browsers;
 })();
@@ -175,14 +174,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());
@@ -227,27 +218,31 @@ function suite(fn, opt_options) {
 
   try {
 
+    before(function() {
+      if (isDevMode) {
+        return build.of(
+            '//javascript/atoms/fragments:is-displayed',
+            '//javascript/webdriver/atoms:getAttribute')
+            .onlyOnce().go();
+      }
+    });
+
     // Server is only started if required for a specific config.
-    testing.after(function() {
+    after(function() {
       if (seleniumServer) {
         return seleniumServer.stop();
       }
     });
 
     browsers.forEach(function(browser) {
-      testing.describe('[' + browser + ']', function() {
+      describe('[' + browser + ']', function() {
 
         if (isDevMode && nativeRun) {
           if (browser === LEGACY_FIREFOX) {
-            testing.before(function() {
+            before(function() {
               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();
-            });
           }
         }
 
@@ -259,7 +254,7 @@ function suite(fn, opt_options) {
                 serverJar, {loopback: useLoopback});
           }
 
-          testing.before(function() {
+          before(function() {
             this.timeout(0);
             return seleniumServer.start(60 * 1000);
           });
@@ -275,14 +270,14 @@ function suite(fn, opt_options) {
 
 // GLOBAL TEST SETUP
 
-testing.before(function() {
+before(function() {
    // Do not pass register fileserver.start directly with testing.before,
    // as start takes an optional port, which before assumes is an async
    // callback.
    return fileserver.start();
 });
 
-testing.after(function() {
+after(function() {
    return fileserver.stop();
 });