Skip to content

Commit b30f9a6

Browse files
titusfortnertitusfortner
committed
[rb] refactor to not get deprecation warnings in specs
1 parent 0c06289 commit b30f9a6

5 files changed

Lines changed: 16 additions & 14 deletions

File tree

‎rb/spec/integration/selenium/webdriver/chrome/options_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module Chrome
2828
it 'passes emulated device correctly' do
2929
options.add_emulation(device_name: 'Nexus 5')
3030

31-
create_driver!(options: options) do |driver|
31+
create_driver!(capabilities: options) do |driver|
3232
ua = driver.execute_script 'return window.navigator.userAgent'
3333
expect(ua).to include('Nexus 5')
3434
end
@@ -37,7 +37,7 @@ module Chrome
3737
it 'passes emulated user agent correctly' do
3838
options.add_emulation(user_agent: 'foo;bar')
3939

40-
create_driver!(options: options) do |driver|
40+
create_driver!(capabilities: options) do |driver|
4141
ua = driver.execute_script 'return window.navigator.userAgent'
4242
expect(ua).to eq('foo;bar')
4343
end
@@ -46,7 +46,7 @@ module Chrome
4646
it 'passes args correctly' do
4747
options.add_argument('--user-agent=foo;bar')
4848

49-
create_driver!(options: options) do |driver|
49+
create_driver!(capabilities: options) do |driver|
5050
ua = driver.execute_script 'return window.navigator.userAgent'
5151
expect(ua).to eq('foo;bar')
5252
end
@@ -55,7 +55,7 @@ module Chrome
5555
it 'should be able to run in headless mode with #headless!' do
5656
options.headless!
5757

58-
create_driver!(options: options) do |driver|
58+
create_driver!(capabilities: options) do |driver|
5959
ua = driver.execute_script 'return window.navigator.userAgent'
6060
expect(ua).to match(/HeadlessChrome/)
6161
end

‎rb/spec/integration/selenium/webdriver/edge_chrome/options_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module EdgeChrome
2828
it 'passes emulated device correctly' do
2929
options.add_emulation(device_name: 'Nexus 5')
3030

31-
create_driver!(options: options) do |driver|
31+
create_driver!(capabilities: options) do |driver|
3232
ua = driver.execute_script 'return window.navigator.userAgent'
3333
expect(ua).to include('Nexus 5')
3434
end
@@ -37,7 +37,7 @@ module EdgeChrome
3737
it 'passes emulated user agent correctly' do
3838
options.add_emulation(user_agent: 'foo;bar')
3939

40-
create_driver!(options: options) do |driver|
40+
create_driver!(capabilities: options) do |driver|
4141
ua = driver.execute_script 'return window.navigator.userAgent'
4242
expect(ua).to eq('foo;bar')
4343
end
@@ -46,7 +46,7 @@ module EdgeChrome
4646
it 'passes args correctly' do
4747
options.add_argument('--user-agent=foo;bar')
4848

49-
create_driver!(options: options) do |driver|
49+
create_driver!(capabilities: options) do |driver|
5050
ua = driver.execute_script 'return window.navigator.userAgent'
5151
expect(ua).to eq('foo;bar')
5252
end
@@ -55,7 +55,7 @@ module EdgeChrome
5555
# it 'should be able to run in headless mode with #headless!' do
5656
# options.headless!
5757
#
58-
# create_driver!(options: options) do |driver|
58+
# create_driver!(capabilities: options) do |driver|
5959
# ua = driver.execute_script 'return window.navigator.userAgent'
6060
# expect(ua).to match(/HeadlessChrome/)
6161
# end

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@ def read_generated_prefs(from = nil)
142142
end
143143

144144
it 'should instantiate the browser with the correct profile' do
145-
create_driver!(options: Options.new(profile: profile)) do |driver|
145+
create_driver!(capabilities: Options.new(profile: profile)) do |driver|
146146
expect { wait(5).until { driver.find_element(id: 'oneline') } }.not_to raise_error
147147
end
148148
end
149149

150150
it 'should be able to use the same profile more than once' do
151-
create_driver!(options: Options.new(profile: profile)) do |driver1|
151+
create_driver!(capabilities: Options.new(profile: profile)) do |driver1|
152152
expect { wait(5).until { driver1.find_element(id: 'oneline') } }.not_to raise_error
153-
create_driver!(options: Options.new(profile: profile)) do |driver2|
153+
create_driver!(capabilities: Options.new(profile: profile)) do |driver2|
154154
expect { wait(5).until { driver2.find_element(id: 'oneline') } }.not_to raise_error
155155
end
156156
end

‎rb/spec/integration/selenium/webdriver/spec_support/rack_server.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ def call(env)
110110
req = Rack::Request.new(env)
111111
body = case req['upload']
112112
when Array
113-
req['upload'].map { |upload| upload[:tempfile].read }.join("\n")
113+
req.params['upload'].map { |upload| upload[:tempfile].read }.join("\n")
114114
when Hash
115-
req['upload'][:tempfile].read
115+
req.params['upload'][:tempfile].read
116116
end
117117

118118
[200, {'Content-Type' => 'text/html'}, [body]]

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@ def check_for_previous_error
191191
end
192192

193193
def create_remote_driver(opt = {})
194-
opt[:desired_capabilities] = remote_capabilities
194+
options = opt.delete(:capabilities)
195+
opt[:capabilities] = [remote_capabilities]
196+
opt[:capabilities] << options if options
195197
opt[:url] = ENV['WD_REMOTE_URL'] || remote_server.webdriver_url
196198
opt[:http_client] ||= WebDriver::Remote::Http::Default.new
197199

0 commit comments

Comments
 (0)