@@ -154,7 +154,7 @@ def get_element_highlight_script(results, old_elements):
154
154
def clear_selector_highlights (driver ):
155
155
try :
156
156
script , arguments = get_element_highlight_script (
157
- [], driver .find_elements_by_css_selector ( "[data-robotkernel]" )
157
+ [], driver .find_elements ( "css selector" , "[data-robotkernel]" )
158
158
)
159
159
except InvalidSessionIdException as e :
160
160
raise BrokenOpenConnection (driver ) from e
@@ -175,7 +175,7 @@ def get_selenium_selector_completions(needle, driver):
175
175
try :
176
176
# Inject supporting JS and CSS
177
177
styles = 'style[data-name="robotkernel"]'
178
- if not driver .find_elements_by_css_selector ( styles ):
178
+ if not driver .find_elements ( "css selector" , styles ):
179
179
with pkg_resources .resource_stream (
180
180
"robotkernel" , "resources/simmerjs/simmer.js"
181
181
) as fp :
@@ -195,7 +195,7 @@ def get_selenium_selector_completions(needle, driver):
195
195
# Highlight
196
196
if can_highlight :
197
197
script , arguments = get_element_highlight_script (
198
- results , driver .find_elements_by_css_selector ( "[data-robotkernel]" )
198
+ results , driver .find_elements ( "css selector" , "[data-robotkernel]" )
199
199
)
200
200
driver .execute_script (script , * arguments )
201
201
@@ -320,11 +320,11 @@ def get_selenium_id_selector_completions(needle, driver):
320
320
needle = needle [3 :]
321
321
matches = []
322
322
if needle :
323
- results = driver .find_elements_by_css_selector (
323
+ results = driver .find_elements ( "css selector" ,
324
324
f'[id="{ needle } "]'
325
- ) or driver .find_elements_by_css_selector ( f'[id*="{ needle } "]' )
325
+ ) or driver .find_elements ( "css selector" , f'[id*="{ needle } "]' )
326
326
else :
327
- results = driver .find_elements_by_xpath ( "//*[@id]" )
327
+ results = driver .find_elements ( "xpath" , "//*[@id]" )
328
328
for result in visible_or_all (results ):
329
329
id_ = result .get_attribute ("id" )
330
330
matches .append ((f"id:{ id_ } " , result ))
@@ -335,11 +335,11 @@ def get_appium_id_selector_completions(needle, driver):
335
335
needle = needle [3 :]
336
336
matches = []
337
337
if needle :
338
- results = driver .find_elements_by_xpath (
338
+ results = driver .find_elements ( "xpath" ,
339
339
f"//*[" f'contains(@resource-id, "{ needle } ")' f"]"
340
340
)
341
341
else :
342
- results = driver .find_elements_by_xpath ( "//*[@resource-id]" )
342
+ results = driver .find_elements ( "xpath" , "//*[@resource-id]" )
343
343
for result in visible_or_all (results ):
344
344
id_ = result .get_attribute ("resource-id" )
345
345
matches .append ((f'xpath=//*[@resource-id="{ id_ } "]' , result ))
@@ -350,11 +350,11 @@ def get_selenium_name_selector_completions(needle, driver):
350
350
needle = needle [5 :]
351
351
matches = []
352
352
if needle :
353
- results = driver .find_elements_by_css_selector (
353
+ results = driver .find_elements ( "css selector" ,
354
354
f'[name="{ needle } "]'
355
- ) or driver .find_elements_by_css_selector ( f'[name*="{ needle } "]' )
355
+ ) or driver .find_elements ( "css selector" , f'[name*="{ needle } "]' )
356
356
else :
357
- results = driver .find_elements_by_xpath ( "//*[@name]" )
357
+ results = driver .find_elements ( "xpath" , "//*[@name]" )
358
358
for result in visible_or_all (results ):
359
359
name = result .get_attribute ("name" )
360
360
matches .append ((f"name:{ name } " , result ))
@@ -401,7 +401,7 @@ def get_selenium_css_selector_completions(needle, driver):
401
401
if not needle :
402
402
needle = get_selenium_needle_from_user (driver )
403
403
if needle :
404
- results = driver .find_elements_by_css_selector ( needle )
404
+ results = driver .find_elements ( "css selector" , needle )
405
405
for result in visible_or_all (results ):
406
406
id_ = result .get_attribute ("id" )
407
407
if " " in needle : # always include simmer result for complex needles
@@ -428,7 +428,7 @@ def get_selenium_tag_selector_completions(needle, driver):
428
428
results = []
429
429
matches = []
430
430
if needle :
431
- results = driver .find_elements_by_css_selector ( needle )
431
+ results = driver .find_elements ( "css selector" , needle )
432
432
for result in visible_or_all (results ):
433
433
id_ = result .get_attribute ("id" )
434
434
if id_ :
@@ -448,9 +448,9 @@ def get_selenium_link_selector_completions(needle, driver):
448
448
needle = needle [5 :]
449
449
matches = []
450
450
if needle :
451
- results = driver .find_elements_by_partial_link_text ( needle )
451
+ results = driver .find_elements ( "partial link text" , needle )
452
452
else :
453
- results = driver .find_elements_by_xpath ( "//a" )
453
+ results = driver .find_elements ( "xpath" , "//a" )
454
454
for result in visible_or_all (results ):
455
455
if result .text :
456
456
matches .append ((f"link:{ result .text } " , result ))
@@ -463,7 +463,7 @@ def get_selenium_xpath_selector_completions(needle, driver):
463
463
matches = []
464
464
unresolved = []
465
465
if needle :
466
- results = driver .find_elements_by_xpath ( needle )
466
+ results = driver .find_elements ( "xpath" , needle )
467
467
for result in visible_or_all (results ):
468
468
id_ = result .get_attribute ("id" )
469
469
if id_ :
@@ -483,13 +483,13 @@ def get_appium_xpath_selector_completions(needle, driver):
483
483
needle = needle [6 :]
484
484
matches = []
485
485
if IS_TEXT .match (needle ):
486
- results = driver .find_elements_by_xpath (
486
+ results = driver .find_elements ( "xpath" ,
487
487
f"//*[" f'contains(@text, "{ needle } ")' f"]"
488
488
)
489
489
elif needle :
490
- results = driver .find_elements_by_xpath ( needle )
490
+ results = driver .find_elements ( "xpath" , needle )
491
491
else :
492
- results = driver .find_elements_by_xpath ( "//*[@resource-id]" )
492
+ results = driver .find_elements ( "xpath" , "//*[@resource-id]" )
493
493
for result in visible_or_all (results ):
494
494
id_ = result .get_attribute ("resource-id" )
495
495
if id_ :
0 commit comments