Skip to content

Commit 0fa6c3f

Browse files
titusfortnertitusfortner
authored
[rb] remove deprecated code (#12417)
1 parent 0267b0f commit 0fa6c3f

23 files changed

Lines changed: 16 additions & 471 deletions

File tree

‎rb/lib/selenium/webdriver/chrome/service.rb‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717
# specific language governing permissions and limitations
1818
# under the License.
1919

20-
require 'selenium/webdriver/chromium/service'
21-
2220
module Selenium
2321
module WebDriver
2422
module Chrome
25-
class Service < Chromium::Service
23+
class Service < WebDriver::Service
2624
DEFAULT_PORT = 9515
2725
EXECUTABLE = 'chromedriver'
2826
SHUTDOWN_SUPPORTED = true

‎rb/lib/selenium/webdriver/chromium.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ module Chromium
2626
autoload :Driver, 'selenium/webdriver/chromium/driver'
2727
autoload :Profile, 'selenium/webdriver/chromium/profile'
2828
autoload :Options, 'selenium/webdriver/chromium/options'
29-
autoload :Service, 'selenium/webdriver/chromium/service'
3029
end # Chromium
3130
end # WebDriver
3231
end # Selenium

‎rb/lib/selenium/webdriver/chromium/options.rb‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -159,24 +159,6 @@ def add_preference(name, value)
159159
@options[:prefs][name] = value
160160
end
161161

162-
#
163-
# Run Chrome in headless mode.
164-
# Old headless uses a non-production browser and is set with `--headless`
165-
# Native headless from v86 - v108 is set with `--headless=chrome`
166-
# Native headless from v109+ is set with `--headless=new`
167-
#
168-
# @example Enable headless mode
169-
# options = Selenium::WebDriver::Chrome::Options.new
170-
# options.headless!
171-
#
172-
173-
def headless!
174-
WebDriver.logger.deprecate('`Options#headless!`',
175-
"`Options#add_argument('--headless=new')`",
176-
id: :headless)
177-
add_argument '--headless'
178-
end
179-
180162
#
181163
# Add emulation device information
182164
#

‎rb/lib/selenium/webdriver/chromium/service.rb‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎rb/lib/selenium/webdriver/common/options.rb‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,6 @@ def initialize(**opts)
8686

8787
def add_option(name, value = nil)
8888
name, value = name.first if value.nil? && name.is_a?(Hash)
89-
90-
unless name.to_s.include?(':')
91-
WebDriver.logger.deprecate('Options#add_option for w3c or browser specific capabilities',
92-
'applicable attribute accessors or pass into constructor',
93-
id: :add_option)
94-
end
9589
@options[name] = value
9690
end
9791

@@ -113,24 +107,11 @@ def as_json(*)
113107
w3c_options = process_w3c_options(options)
114108

115109
browser_options = self.class::CAPABILITIES.each_with_object({}) do |(capability_alias, capability_name), hash|
116-
from_name = options.delete(capability_name)
117-
from_alias = options.delete(capability_alias)
118-
capability_value = if !from_name.nil? && capability_alias != capability_name
119-
WebDriver.logger.deprecate("#{capability_name} as option",
120-
capability_alias.to_s, id: :option_symbols)
121-
from_name
122-
elsif !from_alias.nil?
123-
from_alias
124-
end
125-
110+
capability_value = options.delete(capability_alias)
126111
hash[capability_name] = capability_value unless capability_value.nil?
127112
end
128113

129-
unless options.empty?
130-
msg = 'These options are not w3c compliant and will result in failures in a future release'
131-
WebDriver.logger.warn("#{msg}: #{options}", id: :w3c_options)
132-
browser_options.merge!(options)
133-
end
114+
raise Error::WebDriverError, "These options are not w3c compliant: #{options}" unless options.empty?
134115

135116
browser_options = {self.class::KEY => browser_options} if defined?(self.class::KEY)
136117

‎rb/lib/selenium/webdriver/common/service.rb‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ def initialize(path: nil, port: nil, log: nil, args: nil)
8181
else
8282
log
8383
end
84-
85-
@args = args.is_a?(Hash) ? extract_service_args(args) : args
84+
@args = args
8685

8786
raise Error::WebDriverError, "invalid port: #{@port}" if @port < 1
8887
end
@@ -94,15 +93,6 @@ def launch
9493
def shutdown_supported
9594
self.class::SHUTDOWN_SUPPORTED
9695
end
97-
98-
protected
99-
100-
def extract_service_args(driver_opts)
101-
WebDriver.logger.deprecate('initializing Service class with :args using Hash',
102-
':args parameter with an Array of String values',
103-
id: :driver_opts)
104-
driver_opts.key?(:args) ? driver_opts.delete(:args) : []
105-
end
10696
end # Service
10797
end # WebDriver
10898
end # Selenium

‎rb/lib/selenium/webdriver/edge/service.rb‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717
# specific language governing permissions and limitations
1818
# under the License.
1919

20-
require 'selenium/webdriver/chromium/service'
21-
2220
module Selenium
2321
module WebDriver
2422
module Edge
25-
class Service < Chromium::Service
23+
class Service < WebDriver::Service
2624
DEFAULT_PORT = 9515
2725
EXECUTABLE = 'msedgedriver'
2826
SHUTDOWN_SUPPORTED = true

‎rb/lib/selenium/webdriver/firefox/options.rb‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,6 @@ def add_preference(name, value)
9999
@options[:prefs][name] = value
100100
end
101101

102-
#
103-
# Run Firefox in headless mode.
104-
#
105-
# @example Enable headless mode
106-
# options = Selenium::WebDriver::Firefox::Options.new
107-
# options.headless!
108-
#
109-
110-
def headless!
111-
WebDriver.logger.deprecate('`Options#headless!`',
112-
"`Options#add_argument('-headless')`",
113-
id: :headless)
114-
add_argument '-headless'
115-
end
116-
117102
#
118103
# Sets Firefox profile.
119104
#

‎rb/lib/selenium/webdriver/firefox/service.rb‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,6 @@ class Service < WebDriver::Service
2424
DEFAULT_PORT = 4444
2525
EXECUTABLE = 'geckodriver'
2626
SHUTDOWN_SUPPORTED = false
27-
28-
private
29-
30-
def extract_service_args(driver_opts)
31-
driver_args = super
32-
driver_opts = driver_opts.dup
33-
driver_args << "--binary=#{driver_opts[:binary]}" if driver_opts.key?(:binary)
34-
driver_args << "--log=#{driver_opts[:log]}" if driver_opts.key?(:log)
35-
driver_args << "--marionette-port=#{driver_opts[:marionette_port]}" if driver_opts.key?(:marionette_port)
36-
driver_args << "--host=#{driver_opts[:host]}" if driver_opts.key?(:host)
37-
driver_args
38-
end
3927
end # Service
4028
end # Firefox
4129
end # WebDriver

‎rb/lib/selenium/webdriver/ie/service.rb‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,6 @@ class Service < WebDriver::Service
2424
DEFAULT_PORT = 5555
2525
EXECUTABLE = 'IEDriverServer'
2626
SHUTDOWN_SUPPORTED = true
27-
28-
private
29-
30-
def extract_service_args(driver_opts)
31-
driver_args = super
32-
driver_opts = driver_opts.dup
33-
driver_args << "--log-level=#{driver_opts[:log_level].to_s.upcase}" if driver_opts.key?(:log_level)
34-
driver_args << "--log-file=#{driver_opts[:log_file]}" if driver_opts.key?(:log_file)
35-
if driver_opts.key?(:implementation)
36-
driver_args << "--implementation=#{driver_opts[:implementation].to_s.upcase}"
37-
end
38-
driver_args << "--host=#{driver_opts[:host]}" if driver_opts.key?(:host)
39-
driver_args << "--extract_path=#{driver_opts[:extract_path]}" if driver_opts.key?(:extract_path)
40-
driver_args << '--silent' if driver_opts[:silent] == true
41-
driver_args
42-
end
4327
end # Server
4428
end # IE
4529
end # WebDriver

0 commit comments

Comments
 (0)