Skip to content

Commit 577139c

Browse files
p0dejep0deje
committed
Remove deprecated :service_args driver initialization argument
It has been deprecated since 3.3.0. Use driver_opts: {args: []} instead.
1 parent 5e6049b commit 577139c

File tree

10 files changed

+14
-87
lines changed

10 files changed

+14
-87
lines changed

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,15 @@ def initialize(opts = {})
3434

3535
unless opts.key?(:url)
3636
driver_path = opts.delete(:driver_path) || Chrome.driver_path
37+
driver_opts = opts.delete(:driver_opts) || {}
3738
port = opts.delete(:port) || Service::DEFAULT_PORT
3839

39-
opts[:driver_opts] ||= {}
4040
if opts.key? :service_log_path
4141
WebDriver.logger.deprecate ':service_log_path', "driver_opts: {log_path: '#{opts[:service_log_path]}'}"
42-
opts[:driver_opts][:log_path] = opts.delete :service_log_path
42+
driver_opts[:log_path] = opts.delete :service_log_path
4343
end
4444

45-
if opts.key? :service_args
46-
WebDriver.logger.deprecate ':service_args', "driver_opts: {args: #{opts[:service_args]}}"
47-
opts[:driver_opts][:args] = opts.delete(:service_args)
48-
end
49-
50-
@service = Service.new(driver_path, port, opts.delete(:driver_opts))
45+
@service = Service.new(driver_path, port, driver_opts)
5146
@service.start
5247
opts[:url] = @service.uri
5348
end

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,10 @@ def initialize(opts = {})
3232

3333
unless opts.key?(:url)
3434
driver_path = opts.delete(:driver_path) || Edge.driver_path
35+
driver_opts = opts.delete(:driver_opts) || {}
3536
port = opts.delete(:port) || Service::DEFAULT_PORT
3637

37-
opts[:driver_opts] ||= {}
38-
if opts.key? :service_args
39-
WebDriver.logger.deprecate ':service_args', "driver_opts: {args: #{opts[:service_args]}}"
40-
opts[:driver_opts][:args] = opts.delete(:service_args)
41-
end
42-
43-
@service = Service.new(driver_path, port, opts.delete(:driver_opts))
38+
@service = Service.new(driver_path, port, driver_opts)
4439
@service.host = 'localhost' if @service.host == '127.0.0.1'
4540
@service.start
4641
opts[:url] = @service.uri

‎rb/lib/selenium/webdriver/firefox/marionette/driver.rb‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,10 @@ def initialize(opts = {})
3535

3636
unless opts.key?(:url)
3737
driver_path = opts.delete(:driver_path) || Firefox.driver_path
38+
driver_opts = opts.delete(:driver_opts) || {}
3839
port = opts.delete(:port) || Service::DEFAULT_PORT
3940

40-
opts[:driver_opts] ||= {}
41-
if opts.key? :service_args
42-
WebDriver.logger.deprecate ':service_args', "driver_opts: {args: #{opts[:service_args]}}"
43-
opts[:driver_opts][:args] = opts.delete(:service_args)
44-
end
45-
46-
@service = Service.new(driver_path, port, opts.delete(:driver_opts))
41+
@service = Service.new(driver_path, port, driver_opts)
4742
@service.start
4843
opts[:url] = @service.uri
4944
end

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,16 @@ def initialize(opts = {})
3333

3434
unless opts.key?(:url)
3535
driver_path = opts.delete(:driver_path) || IE.driver_path
36+
driver_opts = opts.delete(:driver_opts) || {}
3637
port = opts.delete(:port) || Service::DEFAULT_PORT
3738

38-
opts[:driver_opts] ||= {}
39-
if opts.key? :service_args
40-
WebDriver.logger.deprecate ':service_args', "driver_opts: {args: #{opts[:service_args]}}"
41-
opts[:driver_opts][:args] = opts.delete(:service_args)
42-
end
43-
4439
%i[log_level log_file implementation].each do |method|
4540
next unless opts.key? method
4641
WebDriver.logger.deprecate ":#{method}", "driver_opts: {#{method}: '#{opts[method]}'}"
47-
opts[:driver_opts][method] = opts.delete(method)
42+
driver_opts[method] = opts.delete(method)
4843
end
4944

50-
@service = Service.new(driver_path, port, opts.delete(:driver_opts))
45+
@service = Service.new(driver_path, port, driver_opts)
5146
@service.start
5247
opts[:url] = @service.uri
5348
end

‎rb/lib/selenium/webdriver/safari/driver.rb‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,10 @@ def initialize(opts = {})
3232

3333
unless opts.key?(:url)
3434
driver_path = opts.delete(:driver_path) || Safari.driver_path
35+
driver_opts = opts.delete(:driver_opts) || {}
3536
port = opts.delete(:port) || Service::DEFAULT_PORT
3637

37-
opts[:driver_opts] ||= {}
38-
if opts.key? :service_args
39-
WebDriver.logger.deprecate ':service_args', "driver_opts: {args: #{opts[:service_args]}}"
40-
opts[:driver_opts][:args] = opts.delete(:service_args)
41-
end
42-
43-
@service = Service.new(driver_path, port, opts.delete(:driver_opts))
38+
@service = Service.new(driver_path, port, driver_opts)
4439
@service.start
4540
opts[:url] = @service.uri
4641
end

‎rb/spec/integration/selenium/webdriver/firefox/driver_spec.rb‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@ module WebDriver
8686
expect { driver.capabilities.browser_version }.to_not raise_exception
8787
end
8888

89-
caps = Remote::Capabilities.firefox(firefox_options: {binary: ENV['ALT_FIREFOX_BINARY']},
90-
service_args: {binary: path})
91-
create_driver!(desired_capabilities: caps) do |driver|
89+
caps = Remote::Capabilities.firefox(firefox_options: {binary: ENV['ALT_FIREFOX_BINARY']})
90+
create_driver!(desired_capabilities: caps, driver_opts: {binary: path}) do |driver|
9291
expect(driver.capabilities.version).to_not eql(@default_version)
9392
expect { driver.capabilities.browser_version }.to_not raise_exception
9493
end

‎rb/spec/unit/selenium/webdriver/chrome/service_spec.rb‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,6 @@ module Chrome
6868
expect(driver.instance_variable_get("@service").instance_variable_get("@extra_args")).to eq args
6969
end
7070

71-
it 'deprecates `service_args`' do
72-
args = ["--port-server=2323",
73-
"--whitelisted-ips=['192.168.0.1', '192.168.0.2']",
74-
"--silent",
75-
"--log-path=/path/to/log"]
76-
77-
expect(WebDriver.logger).to receive(:deprecate).with(':service_args', "driver_opts: {args: #{args}}")
78-
@driver = Driver.new(http_client: http, service_args: args)
79-
expect(@driver.instance_variable_get("@service").instance_variable_get("@extra_args")).to eq args
80-
end
81-
8271
it 'deprecates `service_log_path`' do
8372
message = %r{\[DEPRECATION\] `:service_log_path` is deprecated. Use `driver_opts: {log_path: \/path\/to\/log}`}
8473

‎rb/spec/unit/selenium/webdriver/edge/service_spec.rb‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,6 @@ module Edge
6565
driver = Driver.new(http_client: http, driver_opts: driver_opts)
6666
expect(driver.instance_variable_get("@service").instance_variable_get("@extra_args")).to eq args
6767
end
68-
69-
it 'deprecates `service_args`' do
70-
args = ["--port-server=2323",
71-
"--whitelisted-ips=['192.168.0.1', '192.168.0.2']",
72-
"--silent=true",
73-
"--log-path=/path/to/log"]
74-
75-
expect(WebDriver.logger).to receive(:deprecate).with(':service_args', "driver_opts: {args: #{args}}")
76-
@driver = Driver.new(http_client: http, service_args: args)
77-
expect(@driver.instance_variable_get("@service").instance_variable_get("@extra_args")).to eq args
78-
end
7968
end
8069
end # Edge
8170
end # WebDriver

‎rb/spec/unit/selenium/webdriver/firefox/service_spec.rb‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,6 @@ module Firefox
6767
driver = Driver.new(http_client: http, driver_opts: driver_opts)
6868
expect(driver.instance_variable_get("@service").instance_variable_get("@extra_args")).to eq args
6969
end
70-
71-
it 'deprecates `service_args`' do
72-
args = ["--binary=/path/to/bin",
73-
"–-log=/path/to/log",
74-
"–-marionette-port=9721",
75-
"–-host=localhost"]
76-
77-
expect(WebDriver.logger).to receive(:deprecate).with(':service_args', "driver_opts: {args: #{args}}")
78-
@driver = Driver.new(http_client: http, service_args: args)
79-
expect(@driver.instance_variable_get("@service").instance_variable_get("@extra_args")).to eq args
80-
end
81-
8270
end
8371
end # Firefox
8472
end # WebDriver

‎rb/spec/unit/selenium/webdriver/ie/service_spec.rb‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,6 @@ module IE
7171
driver = Driver.new(http_client: http, driver_opts: driver_opts)
7272
expect(driver.instance_variable_get("@service").instance_variable_get("@extra_args")).to eq args
7373
end
74-
75-
it 'deprecates `service_args`' do
76-
args = ["--log-level=DEBUG",
77-
"--log-file=/foo",
78-
"--implementation=VENDOR",
79-
"--host=localhost",
80-
"--extract_path=/bar",
81-
"--silent"]
82-
83-
expect(WebDriver.logger).to receive(:deprecate).with(':service_args', "driver_opts: {args: #{args}}")
84-
@driver = Driver.new(http_client: http, service_args: args)
85-
expect(@driver.instance_variable_get("@service").instance_variable_get("@extra_args")).to eq args
86-
end
8774
end
8875
end # IE
8976
end # WebDriver

0 commit comments

Comments
 (0)