Skip to content

Commit 34955d3

Browse files
committed
[rb] fix arguments passed into tests
1 parent d9bd8e3 commit 34955d3

File tree

1 file changed

+15
-19
lines changed

1 file changed

+15
-19
lines changed

rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def initialize
2828
@create_driver_error_count = 0
2929

3030
$LOAD_PATH.insert(0, root.join('bazel-bin/rb/lib').to_s) if File.exist?(root.join('bazel-bin/rb/lib'))
31-
WebDriver.logger.ignore(%i[logger_info selenium_manager])
31+
WebDriver.logger.ignore(%i[logger_info])
3232
SeleniumManager.bin_path = root.join('bazel-bin/rb/bin').to_s if File.exist?(root.join('bazel-bin/rb/bin'))
3333

3434
@driver = ENV.fetch('WD_SPEC_DRIVER', 'chrome').tr('-', '_').to_sym
@@ -166,12 +166,12 @@ def create_driver!(listener: nil, **opts, &block)
166166

167167
private
168168

169-
def build_options(args: [], **opts)
169+
def build_options(**opts)
170170
options_method = "#{browser}_options".to_sym
171171
if private_methods.include?(options_method)
172-
send(options_method, args: args, **opts)
172+
send(options_method, **opts)
173173
else
174-
WebDriver::Options.send(browser, args: args, **opts)
174+
WebDriver::Options.send(browser, **opts)
175175
end
176176
end
177177

@@ -226,37 +226,33 @@ def firefox_driver(service: nil, **opts)
226226
end
227227

228228
def safari_driver(**opts)
229-
service_opts = {}
230-
service_opts[:args] = []
231-
service_opts[:args] << '--diagnose' if WebDriver.logger.debug?
229+
service_opts = WebDriver.logger.debug? ? {args: '--diagnose'} : {}
232230
service = WebDriver::Service.safari(**service_opts)
233231
WebDriver::Driver.for(:safari, service: service, **opts)
234232
end
235233

236234
def safari_preview_driver(**opts)
237-
service_opts = {}
238-
service_opts[:args] = []
239-
service_opts[:args] << '--diagnose' if WebDriver.logger.debug?
235+
service_opts = WebDriver.logger.debug? ? {args: '--diagnose'} : {}
240236
service = WebDriver::Service.safari(**service_opts)
241237
WebDriver::Driver.for(:safari, service: service, **opts)
242238
end
243239

244-
def chrome_options(**opts)
240+
def chrome_options(args: [], **opts)
245241
opts[:binary] ||= ENV['CHROME_BINARY'] if ENV.key?('CHROME_BINARY')
246-
opts[:args] << '--headless=chrome' if ENV['HEADLESS']
247-
WebDriver::Options.chrome(**opts)
242+
args << '--headless=chrome' if ENV['HEADLESS']
243+
WebDriver::Options.chrome(args: args, **opts)
248244
end
249245

250-
def edge_options(**opts)
246+
def edge_options(args: [], **opts)
251247
opts[:binary] ||= ENV['EDGE_BINARY'] if ENV.key?('EDGE_BINARY')
252-
opts[:args] << '--headless=chrome' if ENV['HEADLESS']
253-
WebDriver::Options.edge(**opts)
248+
args << '--headless=chrome' if ENV['HEADLESS']
249+
WebDriver::Options.edge(args: args, **opts)
254250
end
255251

256-
def firefox_options(**opts)
252+
def firefox_options(args: [], **opts)
257253
opts[:binary] ||= ENV['FIREFOX_BINARY'] if ENV.key?('FIREFOX_BINARY')
258-
opts[:args] << '--headless' if ENV['HEADLESS']
259-
WebDriver::Options.firefox(**opts)
254+
args << '--headless' if ENV['HEADLESS']
255+
WebDriver::Options.firefox(args: args, **opts)
260256
end
261257

262258
def ie_options(**opts)

0 commit comments

Comments
 (0)