Skip to content

Commit 6e95f25

Browse files
authored
Merge pull request robotframework#1931 from emanlove/downgrade-click-version
Downgrade click version
2 parents 68b8149 + 33bd5ef commit 6e95f25

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed

.github/workflows/CI.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@ jobs:
8787
# sudo chmod u+x ./selenium-server-standalone.jar
8888
# xvfb-run --auto-servernum python atest/run.py --zip headlesschrome --grid True
8989

90-
- uses: actions/upload-artifact@v3
90+
- uses: actions/upload-artifact@v4
9191
if: failure()
9292
with:
9393
name: SeleniumLibrary Test results
9494
path: atest/zip_results
95+
overwrite: true

atest/acceptance/locators/custom.robot

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ Teardown Custom Locator
5555
Custom Locator Strategy
5656
[Arguments] ${browser} ${locator} ${tag} ${constraints}
5757
${element}= Execute Javascript return window.document.getElementById('${locator}') || [];
58-
[Return] ${element}
58+
RETURN ${element}

atest/acceptance/resource.robot

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Open Browser To Start Page Without Testing Default Options
2424
... desired_capabilities=${DESIRED_CAPABILITIES} alias=${alias}
2525
${orig speed} = Set Selenium Speed ${SPEED}
2626
${orig timeout} = Set Selenium Timeout 10 seconds
27-
[Return] ${orig speed} 5 seconds
27+
RETURN ${orig speed} 5 seconds
2828

2929
Cannot Be Executed In IE
3030
[Documentation] Cannot Be Executed In IE

atest/run.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ def process_output(browser):
251251
print("Verifying results...")
252252
options = []
253253
output = os.path.join(RESULTS_DIR, "output.xml")
254-
robotstatuschecker.process_output(output, verbose=False)
254+
robotstatuschecker.process_output(output)
255255
options.extend([opt.format(browser=browser) for opt in REBOT_OPTIONS])
256256
try:
257257
rebot_cli(options + [output])

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
selenium >= 4.3.0
22
robotframework >= 4.1.3
33
robotframework-pythonlibcore >= 4.4.1
4-
click >= 8.1.7
4+
click >= 8.0

src/SeleniumLibrary/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ class SeleniumLibrary(DynamicCore):
238238
239239
| Custom Locator Strategy | [Arguments] | ${browser} | ${locator} | ${tag} | ${constraints} |
240240
| | ${element}= | Execute Javascript | return window.document.getElementById('${locator}'); |
241-
| | [Return] | ${element} |
241+
| | RETURN | ${element} |
242242
243243
This keyword is a reimplementation of the basic functionality of the
244244
``id`` locator where ``${browser}`` is a reference to a WebDriver

utest/test/api/approved_files/PluginDocumentation.test_many_plugins.approved.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ a WebElement that should be acted on:
177177

178178
| Custom Locator Strategy | [Arguments] | ${browser} | ${locator} | ${tag} | ${constraints} |
179179
| | ${element}= | Execute Javascript | return window.document.getElementById('${locator}'); |
180-
| | [Return] | ${element} |
180+
| | RETURN | ${element} |
181181

182182
This keyword is a reimplementation of the basic functionality of the
183183
``id`` locator where ``${browser}`` is a reference to a WebDriver

0 commit comments

Comments
 (0)