Skip to content

Commit 0363996

Browse files
titusfortnertitusfortner
committed
rb - convert bridge methods to snake case
1 parent 2f048df commit 0363996

File tree

26 files changed

+357
-357
lines changed

26 files changed

+357
-357
lines changed

‎rb/.rubocop.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ Style/MutableConstant:
4040
- 'lib/selenium/webdriver/remote/bridge.rb'
4141
- 'lib/selenium/webdriver/remote/w3c_bridge.rb'
4242

43-
# There shouldn't be any reason to use camel case instead of snake case here
44-
Style/MethodName:
45-
Enabled: false
46-
4743
# TODO: Refactor Chrome::Bridge#create_capabilities
4844
Metrics/PerceivedComplexity:
4945
Max: 11

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@ def initialize(bridge)
2424
@bridge = bridge
2525

2626
# fail fast if the alert doesn't exist
27-
bridge.getAlertText
27+
bridge.alert_text
2828
end
2929

3030
def accept
31-
@bridge.acceptAlert
31+
@bridge.accept_alert
3232
end
3333

3434
def dismiss
35-
@bridge.dismissAlert
35+
@bridge.dismiss_alert
3636
end
3737

3838
def send_keys(keys)
39-
@bridge.setAlertValue keys
39+
@bridge.alert = keys
4040
end
4141

4242
def text
43-
@bridge.getAlertText
43+
@bridge.alert_text
4444
end
4545

4646
def authenticate(username, password)
47-
@bridge.setAuthentication username: username, password: password
47+
@bridge.authentication(username: username, password: password)
4848
accept
4949
end
5050
end # Alert

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def get(url)
141141
#
142142

143143
def current_url
144-
bridge.getCurrentUrl
144+
bridge.url
145145
end
146146

147147
#
@@ -151,7 +151,7 @@ def current_url
151151
#
152152

153153
def title
154-
bridge.getTitle
154+
bridge.title
155155
end
156156

157157
#
@@ -161,7 +161,7 @@ def title
161161
#
162162

163163
def page_source
164-
bridge.getPageSource
164+
bridge.page_source
165165
end
166166

167167
#
@@ -188,7 +188,7 @@ def close
188188
#
189189

190190
def window_handles
191-
bridge.getWindowHandles
191+
bridge.window_handles
192192
end
193193

194194
#
@@ -198,7 +198,7 @@ def window_handles
198198
#
199199

200200
def window_handle
201-
bridge.getCurrentWindowHandle
201+
bridge.window_handle
202202
end
203203

204204
#
@@ -214,7 +214,7 @@ def window_handle
214214
#
215215

216216
def execute_script(script, *args)
217-
bridge.executeScript(script, *args)
217+
bridge.execute_script(script, *args)
218218
end
219219

220220
# Execute an asynchronous piece of JavaScript in the context of the
@@ -233,7 +233,7 @@ def execute_script(script, *args)
233233
#
234234

235235
def execute_async_script(script, *args)
236-
bridge.executeAsyncScript(script, *args)
236+
bridge.execute_async_script(script, *args)
237237
end
238238

239239
#-------------------------------- sugar --------------------------------

‎rb/lib/selenium/webdriver/common/driver_extensions/has_location.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ module WebDriver
2222
module DriverExtensions
2323
module HasLocation
2424
def location
25-
@bridge.getLocation
25+
@bridge.location
2626
end
2727

2828
def location=(loc)
2929
unless loc.is_a?(Location)
3030
raise TypeError, "expected #{Location}, got #{loc.inspect}:#{loc.class}"
3131
end
3232

33-
@bridge.setLocation loc.latitude, loc.longitude, loc.altitude
33+
@bridge.set_location loc.latitude, loc.longitude, loc.altitude
3434
end
3535

3636
def set_location(lat, lon, alt)

‎rb/lib/selenium/webdriver/common/driver_extensions/has_network_connection.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module WebDriver
2222
module DriverExtensions
2323
module HasNetworkConnection
2424
def network_connection_type
25-
connection_value = @bridge.getNetworkConnection
25+
connection_value = @bridge.network_connection
2626

2727
connection_type = values_to_type[connection_value]
2828

@@ -36,7 +36,7 @@ def network_connection_type=(connection_type)
3636

3737
connection_value = type_to_values[connection_type]
3838

39-
@bridge.setNetworkConnection connection_value
39+
@bridge.network_connection = connection_value
4040
end
4141

4242
private

‎rb/lib/selenium/webdriver/common/driver_extensions/rotatable.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def rotation=(orientation)
4040
raise ArgumentError, "expected #{ORIENTATIONS.inspect}, got #{orientation.inspect}"
4141
end
4242

43-
bridge.setScreenOrientation(orientation.to_s.upcase)
43+
bridge.screen_orientation = orientation.to_s.upcase
4444
end
4545
alias_method :rotate, :rotation=
4646

@@ -53,7 +53,7 @@ def rotation=(orientation)
5353
#
5454

5555
def orientation
56-
bridge.getScreenOrientation.to_sym.downcase
56+
bridge.screen_orientation.to_sym.downcase
5757
end
5858
end # Rotatable
5959
end # DriverExtensions

‎rb/lib/selenium/webdriver/common/driver_extensions/takes_screenshot.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ def save_screenshot(png_path)
4646
def screenshot_as(format)
4747
case format
4848
when :base64
49-
bridge.getScreenshot
49+
bridge.screenshot
5050
when :png
51-
bridge.getScreenshot.unpack('m')[0]
51+
bridge.screenshot.unpack('m')[0]
5252
else
5353
raise Error::UnsupportedOperationError, "unsupported format: #{format.inspect}"
5454
end

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def hash
7171
#
7272

7373
def click
74-
bridge.clickElement @id
74+
bridge.click_element @id
7575
end
7676

7777
#
@@ -85,7 +85,7 @@ def click
8585
#
8686

8787
def tag_name
88-
bridge.getElementTagName @id
88+
bridge.element_tag_name @id
8989
end
9090

9191
#
@@ -115,7 +115,7 @@ def tag_name
115115
#
116116

117117
def attribute(name)
118-
bridge.getElementAttribute @id, name
118+
bridge.element_attribute @id, name
119119
end
120120

121121
#
@@ -125,7 +125,7 @@ def attribute(name)
125125
#
126126

127127
def text
128-
bridge.getElementText @id
128+
bridge.element_text @id
129129
end
130130

131131
#
@@ -143,7 +143,7 @@ def text
143143
#
144144

145145
def send_keys(*args)
146-
bridge.sendKeysToElement @id, Keys.encode(args)
146+
bridge.send_keys_to_element @id, Keys.encode(args)
147147
end
148148
alias_method :send_key, :send_keys
149149

@@ -158,7 +158,7 @@ def send_keys(*args)
158158
#
159159

160160
def clear
161-
bridge.clearElement @id
161+
bridge.clear_element @id
162162
end
163163

164164
#
@@ -168,7 +168,7 @@ def clear
168168
#
169169

170170
def enabled?
171-
bridge.isElementEnabled @id
171+
bridge.element_enabled? @id
172172
end
173173

174174
#
@@ -178,7 +178,7 @@ def enabled?
178178
#
179179

180180
def selected?
181-
bridge.isElementSelected @id
181+
bridge.element_selected? @id
182182
end
183183

184184
#
@@ -188,15 +188,15 @@ def selected?
188188
#
189189

190190
def displayed?
191-
bridge.isElementDisplayed @id
191+
bridge.element_displayed? @id
192192
end
193193

194194
#
195195
# Submit this element
196196
#
197197

198198
def submit
199-
bridge.submitElement @id
199+
bridge.submit_element @id
200200
end
201201

202202
#
@@ -211,7 +211,7 @@ def submit
211211
#
212212

213213
def css_value(prop)
214-
bridge.getElementValueOfCssProperty @id, prop
214+
bridge.element_value_of_css_property @id, prop
215215
end
216216
alias_method :style, :css_value
217217

@@ -222,7 +222,7 @@ def css_value(prop)
222222
#
223223

224224
def location
225-
bridge.getElementLocation @id
225+
bridge.element_location @id
226226
end
227227

228228
#
@@ -232,7 +232,7 @@ def location
232232
#
233233

234234
def location_once_scrolled_into_view
235-
bridge.getElementLocationOnceScrolledIntoView @id
235+
bridge.element_location_once_scrolled_into_view @id
236236
end
237237

238238
#
@@ -242,7 +242,7 @@ def location_once_scrolled_into_view
242242
#
243243

244244
def size
245-
bridge.getElementSize @id
245+
bridge.element_size @id
246246
end
247247

248248
#-------------------------------- sugar --------------------------------

‎rb/lib/selenium/webdriver/common/html5/local_storage.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ def initialize(bridge)
3131
end
3232

3333
def [](key)
34-
@bridge.getLocalStorageItem key
34+
@bridge.local_storage_item key
3535
end
3636

3737
def []=(key, value)
38-
@bridge.setLocalStorageItem key, value
38+
@bridge.local_storage_item key, value
3939
end
4040

4141
def delete(key)
42-
@bridge.removeLocalStorageItem key
42+
@bridge.remove_local_storage_item key
4343
end
4444

4545
def clear
46-
@bridge.clearLocalStorage
46+
@bridge.clear_local_storage
4747
end
4848

4949
def size
50-
@bridge.getLocalStorageSize
50+
@bridge.local_storage_size
5151
end
5252

5353
def keys
54-
@bridge.getLocalStorageKeys.reverse
54+
@bridge.local_storage_keys.reverse
5555
end
5656
end # LocalStorage
5757
end # HTML5

‎rb/lib/selenium/webdriver/common/html5/session_storage.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,27 @@ class SessionStorage
2525
include SharedWebStorage
2626

2727
def [](key)
28-
@bridge.getSessionStorageItem key
28+
@bridge.session_storage_item key
2929
end
3030

3131
def []=(key, value)
32-
@bridge.setSessionStorageItem key, value
32+
@bridge.session_storage_item key, value
3333
end
3434

3535
def delete(key)
36-
@bridge.removeSessionStorageItem key
36+
@bridge.remove_session_storage_item key
3737
end
3838

3939
def clear
40-
@bridge.clearSessionStorage
40+
@bridge.clear_session_storage
4141
end
4242

4343
def size
44-
@bridge.getSessionStorageSize
44+
@bridge.session_storage_size
4545
end
4646

4747
def keys
48-
@bridge.getSessionStorageKeys.reverse
48+
@bridge.session_storage_keys.reverse
4949
end
5050

5151
#

0 commit comments

Comments
 (0)