[rb] remove deprecations for setting driver path by module method

SeleniumHQ · Feb 24, 2017 · 07178f1 · 07178f1
1 parent 4319d0a
commit 07178f1
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 90 deletions.
diff --git a/rb/lib/selenium/webdriver/chrome.rb b/rb/lib/selenium/webdriver/chrome.rb
@@ -27,23 +27,11 @@ module Selenium
   module WebDriver
     module Chrome
       def self.driver_path=(path)
-        warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-          [DEPRECATION] `driver_path=` is deprecated. Pass the driver path as an option instead.
-          e.g. Selenium::WebDriver.for :chrome, driver_path: '/path'
-        DEPRECATE
-
         Platform.assert_executable path
         @driver_path = path
       end
 
-      def self.driver_path(warning = true)
-        if warning
-          warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-            [DEPRECATION] `driver_path` is deprecated. Pass the driver path as an option instead.
-            e.g. Selenium::WebDriver.for :chrome, driver_path: '/path'
-          DEPRECATE
-        end
-
+      def self.driver_path
         @driver_path ||= nil
       end
 

diff --git a/rb/lib/selenium/webdriver/chrome/bridge.rb b/rb/lib/selenium/webdriver/chrome/bridge.rb
@@ -31,7 +31,7 @@ def initialize(opts = {})
           end
 
           unless opts.key?(:url)
-            driver_path = opts.delete(:driver_path) || Chrome.driver_path(false)
+            driver_path = opts.delete(:driver_path) || Chrome.driver_path
             @service = Service.new(driver_path, port, *extract_service_args(service_args))
             @service.start
             opts[:url] = @service.uri

diff --git a/rb/lib/selenium/webdriver/edge.rb b/rb/lib/selenium/webdriver/edge.rb
@@ -26,23 +26,11 @@ module Selenium
   module WebDriver
     module Edge
       def self.driver_path=(path)
-        warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-          [DEPRECATION] `driver_path=` is deprecated. Pass the driver path as an option instead.
-          e.g. Selenium::WebDriver.for :edge, driver_path: '/path'
-        DEPRECATE
-
         Platform.assert_executable path
         @driver_path = path
       end
 
       def self.driver_path(warning = true)
-        if warning
-          warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-            [DEPRECATION] `driver_path` is deprecated. Pass the driver path as an option instead.
-            e.g. Selenium::WebDriver.for :edge, driver_path: '/path'
-          DEPRECATE
-        end
-
         @driver_path ||= nil
       end
     end # Edge

diff --git a/rb/lib/selenium/webdriver/edge/bridge.rb b/rb/lib/selenium/webdriver/edge/bridge.rb
@@ -30,7 +30,7 @@ def initialize(opts = {})
           service_args = opts.delete(:service_args) || {}
 
           unless opts.key?(:url)
-            driver_path = opts.delete(:driver_path) || Edge.driver_path(false)
+            driver_path = opts.delete(:driver_path) || Edge.driver_path
             @service = Service.new(driver_path, port, *extract_service_args(service_args))
             @service.host = 'localhost' if @service.host == '127.0.0.1'
             @service.start

diff --git a/rb/lib/selenium/webdriver/firefox.rb b/rb/lib/selenium/webdriver/firefox.rb
@@ -42,23 +42,11 @@ module Firefox
       DEFAULT_LOAD_NO_FOCUS_LIB = false
 
       def self.driver_path=(path)
-        warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-          [DEPRECATION] `driver_path=` is deprecated. Pass the driver path as an option instead.
-          e.g. Selenium::WebDriver.for :firefox, driver_path: '/path'
-        DEPRECATE
-
         Platform.assert_executable path
         @driver_path = path
       end
 
-      def self.driver_path(warning = true)
-        if warning
-          warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-            [DEPRECATION] `driver_path` is deprecated. Pass the driver path as an option instead.
-            e.g. Selenium::WebDriver.for :firefox, driver_path: '/path'
-          DEPRECATE
-        end
-
+      def self.driver_path
         @driver_path ||= nil
       end
 

diff --git a/rb/lib/selenium/webdriver/firefox/w3c_bridge.rb b/rb/lib/selenium/webdriver/firefox/w3c_bridge.rb
@@ -27,7 +27,7 @@ def initialize(opts = {})
           opts[:desired_capabilities] = create_capabilities(opts)
           service_args = opts.delete(:service_args) || {}
 
-          driver_path = opts.delete(:driver_path) || Firefox.driver_path(false)
+          driver_path = opts.delete(:driver_path) || Firefox.driver_path
           @service = Service.new(driver_path, port, *extract_service_args(service_args))
           @service.start
           opts[:url] = @service.uri

diff --git a/rb/lib/selenium/webdriver/ie.rb b/rb/lib/selenium/webdriver/ie.rb
@@ -24,23 +24,11 @@ module Selenium
   module WebDriver
     module IE
       def self.driver_path=(path)
-        warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-          [DEPRECATION] `driver_path=` is deprecated. Pass the driver path as an option instead.
-          e.g. Selenium::WebDriver.for :ie, driver_path: '/path'
-        DEPRECATE
-
         Platform.assert_executable path
         @driver_path = path
       end
 
-      def self.driver_path(warning = true)
-        if warning
-          warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-            [DEPRECATION] `driver_path` is deprecated. Pass the driver path as an option instead.
-            e.g. Selenium::WebDriver.for :ie, driver_path: '/path'
-          DEPRECATE
-        end
-
+      def self.driver_path
         @driver_path ||= nil
       end
     end # IE

diff --git a/rb/lib/selenium/webdriver/ie/bridge.rb b/rb/lib/selenium/webdriver/ie/bridge.rb
@@ -29,7 +29,7 @@ def initialize(opts = {})
           port = opts.delete(:port) || Service::DEFAULT_PORT
           service_args = opts.delete(:service_args) || {}
           service_args = match_legacy(opts, service_args)
-          driver_path = opts.delete(:driver_path) || IE.driver_path(false)
+          driver_path = opts.delete(:driver_path) || IE.driver_path
 
           @service = Service.new(driver_path, port, *extract_service_args(service_args))
           @service.start

diff --git a/rb/lib/selenium/webdriver/phantomjs.rb b/rb/lib/selenium/webdriver/phantomjs.rb
@@ -25,25 +25,17 @@
 module Selenium
   module WebDriver
     module PhantomJS
-      def self.path=(path)
-        warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-          [DEPRECATION] `path=` is deprecated. Pass the driver path as an option instead.
-          e.g. Selenium::WebDriver.for :phantomjs, driver_path: '/path'
-        DEPRECATE
-
-        Platform.assert_executable path
-        @path = path
-      end
-
-      def self.path(warning = true)
-        if warning
-          warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-            [DEPRECATION] `path` is deprecated. Pass the driver path as an option instead.
-            e.g. Selenium::WebDriver.for :phantomjs, driver_path: '/path'
-          DEPRECATE
+      class << self
+        def path=(path)
+          Platform.assert_executable path
+          @path = path
         end
+        alias_method :driver_path=, :path=
 
-        @path ||= nil
+        def path
+          @path ||= nil
+        end
+        alias_method :driver_path, :path
       end
     end # PhantomJS
   end # WebDriver

diff --git a/rb/lib/selenium/webdriver/phantomjs/bridge.rb b/rb/lib/selenium/webdriver/phantomjs/bridge.rb
@@ -30,7 +30,7 @@ def initialize(opts = {})
           opts[:desired_capabilities] ||= Remote::Capabilities.phantomjs
 
           unless opts.key?(:url)
-            driver_path = opts.delete(:driver_path) || PhantomJS.path(false)
+            driver_path = opts.delete(:driver_path) || PhantomJS.path
             args = opts.delete(:args) || opts[:desired_capabilities]['phantomjs.cli.args']
             @service = Service.new(driver_path, port, *args)
             @service.start

diff --git a/rb/lib/selenium/webdriver/safari.rb b/rb/lib/selenium/webdriver/safari.rb
@@ -24,6 +24,14 @@ module Selenium
   module WebDriver
     module Safari
       class << self
+        def technology_preview
+          "/Applications/Safari\ Technology\ Preview.app/Contents/MacOS/safaridriver"
+        end
+
+        def technology_preview!
+          self.driver_path = technology_preview
+        end
+
         def path=(path)
           Platform.assert_executable(path)
           @path = path
@@ -37,23 +45,11 @@ def path
         end
 
         def driver_path=(path)
-          warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-            [DEPRECATION] `driver_path=` is deprecated. Pass the driver path as an option instead.
-            e.g. Selenium::WebDriver.for :safari, driver_path: '/path'
-          DEPRECATE
-
           Platform.assert_executable path
           @driver_path = path
         end
 
-        def driver_path(warning = true)
-          if warning
-            warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-              [DEPRECATION] `driver_path` is deprecated. Pass the driver path as an option instead.
-              e.g. Selenium::WebDriver.for :safari, driver_path: '/path'
-            DEPRECATE
-          end
-
+        def driver_path
           @driver_path ||= nil
         end
       end

diff --git a/rb/lib/selenium/webdriver/safari/bridge.rb b/rb/lib/selenium/webdriver/safari/bridge.rb
@@ -27,7 +27,7 @@ def initialize(opts = {})
           port = opts.delete(:port) || Service::DEFAULT_PORT
           service_args = opts.delete(:service_args) || {}
 
-          driver_path = opts.delete(:driver_path) || Safari.driver_path(false)
+          driver_path = opts.delete(:driver_path) || Safari.driver_path
           @service = Service.new(driver_path, port, *extract_service_args(service_args))
           @service.start
           opts[:url] = @service.uri

diff --git a/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb b/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb
@@ -250,9 +250,7 @@ def create_phantomjs_driver(opt = {})
         end
 
         def create_safari_preview_driver(opt = {})
-          tech_preview_driver = "/Applications/Safari\ Technology\ Preview.app/Contents/MacOS/safaridriver"
-          raise DriverInstantiationError, "Install Safari Technology Preview on MacOS Sierra" unless File.exist?(tech_preview_driver)
-          opt[:driver_path] ||= tech_preview_driver
+          Safari.technology_preview!
           WebDriver::Driver.for :safari, opt
         end