rb - Delete Legacy SafariDriver #2725

Author: titusfortner

rb/build.desc

@@ -279,10 +279,7 @@ ruby_library(name = "safari",
     "lib/selenium/webdriver/safari/**/*.rb",
     "lib/selenium/webdriver/safari.rb"
   ],
-  deps = [":common"],
-  resources = [
-    { "//javascript/safari-driver:client": "rb/lib/selenium/webdriver/safari/resources/client.js"}
-  ]
+  deps = [":common"]
 )
 
 ruby_test(name = "safari",

rb/lib/selenium/webdriver/common/driver.rb

@@ -65,11 +65,7 @@ def for(browser, opts = {})
                    when :phantomjs
                      PhantomJS::Bridge.new(opts)
                    when :safari
-                     if Safari::LegacyBridge.legacy?
-                       Safari::LegacyBridge.new(opts)
-                     else
-                       Safari::AppleBridge.new(opts)
-                     end
+                     Safari::Bridge.new(opts)
                    else
                      raise ArgumentError, "unknown driver: #{browser.inspect}"
                    end

rb/lib/selenium/webdriver/safari.rb

@@ -71,11 +71,5 @@ def driver_path
   end # WebDriver
 end # Selenium
 
-require 'selenium/webdriver/safari/browser'
-require 'selenium/webdriver/safari/server'
-require 'selenium/webdriver/safari/options'
-require 'selenium/webdriver/safari/legacy_bridge'
-require 'selenium/webdriver/safari/apple_bridge'
+require 'selenium/webdriver/safari/bridge'
 require 'selenium/webdriver/safari/service'
-
-Selenium::WebDriver::Safari::Bridge = Selenium::WebDriver::Safari::LegacyBridge

rb/lib/selenium/webdriver/safari/apple_bridge.rb renamed to rb/lib/selenium/webdriver/safari/bridge.rb

@@ -21,7 +21,7 @@ module Selenium
   module WebDriver
     module Safari
       # @api private
-      class AppleBridge < Remote::Bridge
+      class Bridge < Remote::Bridge
         def initialize(opts = {})
           opts[:desired_capabilities] ||= Remote::Capabilities.safari
           port = opts.delete(:port) || Service::DEFAULT_PORT
@@ -45,7 +45,7 @@ def quit
         def extract_service_args(args = {})
           args.key?(:port) ? ["--port=#{args[:port]}"] : []
         end
-      end # AppleBridge
+      end # Bridge
     end # Safari
   end # WebDriver
 end # Selenium