Skip to content

Syncing from upstream robotframework/SeleniumLibrary (master) #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bt-admin merged 22 commits into from
Apr 8, 2026
Merged

Syncing from upstream robotframework/SeleniumLibrary (master) #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
00f7f17
Adding the type annotation for the cascading locators to keywords
emanlove Jan 19, 2026
22b9dd2
Additional changes for cascading locators
emanlove Jan 19, 2026
9f5b9c7
Minor spelling correction
emanlove Jan 19, 2026
700eaa6
Switched locator type over to TypeAlias
emanlove Apr 5, 2026
87c1963
Set minimum Python version to 3.10
emanlove Apr 5, 2026
d4c141d
Fixed expected output on test after recent spelling correction change
emanlove Apr 6, 2026
f2d924a
Added missing import for new Locator type
emanlove Apr 6, 2026
5c113c6
Corrected expiry time on far_future cookie
emanlove Apr 6, 2026
822a862
(Temporarily) Fixed issue with Get Cookies test
emanlove Apr 6, 2026
3139960
Added regex to handle any order on cookies
emanlove Apr 6, 2026
8c0ae7e
Cleaned up type for arguments where could be Locator or None
emanlove Apr 6, 2026
baba970
Cleaned up imports removing unused List, Union, and WebElement
emanlove Apr 6, 2026
54ba867
Update cookie validation regex in Get Cookies test
yuriverweij Apr 7, 2026
d834e31
Fix deprecation warnings in unit tests and improve logging for approv…
yuriverweij Apr 7, 2026
10a27b8
Fix formatting issues in locator examples in PluginDocumentation
yuriverweij Apr 7, 2026
dc16969
Fix formatting issue in locator list creation in SeleniumLibrary
yuriverweij Apr 7, 2026
8ef4b25
Updated expected results on plugin documentation (with xpath example …
emanlove Apr 8, 2026
eea629c
Merge pull request #1973 from yuriverweij/bugfix/get-cookies-atest
emanlove Apr 8, 2026
fa186e5
Merge branch 'master' into fix/unittest-fix-deprecation-and-improve-l…
emanlove Apr 8, 2026
02b7378
Merge pull request #1974 from yuriverweij/fix/unittest-fix-deprecatio…
emanlove Apr 8, 2026
b74848e
Merge branch 'master' into 1962-add-locator-type
emanlove Apr 8, 2026
2141caf
Merge pull request #1972 from emanlove/1962-add-locator-type
emanlove Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions atest/acceptance/keywords/cookies.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ Library DateTime
*** Test Cases ***
Get Cookies
${cookies}= Get Cookies
Should Contain ${cookies} test=seleniumlibrary
Should Contain ${cookies} another=value
Should Contain ${cookies} far_future=timemachine
Should Match Regexp ${cookies}
... ^(test=seleniumlibrary; another=value)|(another=value; test=seleniumlibrary)$
... ^(?:test=seleniumlibrary|another=value|far_future=timemachine)(?:; (?:test=seleniumlibrary|another=value|far_future=timemachine)){2}$

Get Cookies As Dict
${cookies}= Get Cookies as_dict=True
Expand Down Expand Up @@ -136,4 +139,4 @@ Add Cookies
${tomorrow_thistime_datetime} = Convert Date ${tomorrow_thistime} datetime
Set Suite Variable ${tomorrow_thistime_datetime}
Add Cookie another value expiry=${tomorrow_thistime}
Add Cookie far_future timemachine expiry=1788236700 # 2026-09-01 12:25:00
Add Cookie far_future timemachine expiry=1788240300 # 2026-09-01 12:25:00
2 changes: 0 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Expand Down
4 changes: 2 additions & 2 deletions src/SeleniumLibrary/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ class SeleniumLibrary(DynamicCore):
used to specify multiple locators. This is useful, is some part of locator would match as the locator separator
but it should not. Or if there is need to existing WebElement as locator.

Although all locators support chaining, some locator strategies do not abey the chaining. This is because
Although all locators support chaining, some locator strategies do not obey the chaining. This is because
some locator strategies use JavaScript to find elements and JavaScript is executed for the whole browser context
and not for the element found be the previous locator. Chaining is supported by locator strategies which
are based on Selenium API, like `xpath` or `css`, but example chaining is not supported by `sizzle` or `jquery
Expand All @@ -214,7 +214,7 @@ class SeleniumLibrary(DynamicCore):
| ${locator_list} = | `Create List` | css:div#div_id | xpath: //*[text(), " >> "] |
| `Page Should Contain Element` | ${locator_list} | | |
| ${element} = | Get WebElement | xpath: //*[text(), " >> "] | |
| ${locator_list} = | `Create List` | css:div#div_id | ${element } |
| ${locator_list} = | `Create List` | css:div#div_id | ${element} |
| `Page Should Contain Element` | ${locator_list} | | |

Chaining locators in new in SeleniumLibrary 5.0
Expand Down
Loading
Loading