Skip to content

Commit 872bb0a

Browse files
committed
build: update robotframework-seleniumlibrary-java to 3.141.59.26535
Also remove workarounds for the issues that have been fixed in this release. Fix #1166
1 parent 2794d4a commit 872bb0a

File tree

8 files changed

+15
-37
lines changed

8 files changed

+15
-37
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@
550550
<resources.plugin.version>3.1.0</resources.plugin.version>
551551
<robotframework-httprequest.version>0.0.15</robotframework-httprequest.version>
552552
<robotframework-plugin.version>1.5.1</robotframework-plugin.version>
553-
<robotframework-selenium.version>3.141.59.2653</robotframework-selenium.version>
553+
<robotframework-selenium.version>3.141.59.26535</robotframework-selenium.version>
554554
<robotframework.version>3.1.2</robotframework.version>
555555

556556
<!-- Don't forget to update version in the ResourceUrl class and in the src/main/webapp/WEB-INF/views/series/add.html -->

src/test/robotframework/account/registration/misc-anonymous.robot

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
*** Settings ***
22
Documentation Verify miscellaneous aspects of account registration from anonymous user
33
Library SeleniumLibrary
4-
Resource ../../selenium.utils.robot
54
Suite Setup Before Test Suite
65
Suite Teardown Close Browser
76
Force Tags account registration misc
87

98
*** Test Cases ***
109
Email should be striped from leading and trailing spaces
11-
Input Text id:email ${SPACE * 2}test${SPACE * 2}
12-
Submit Form id:register-account-form
13-
Emailfield Value Should Be id:email test
10+
Input Text id:email ${SPACE * 2}test${SPACE * 2}
11+
Submit Form id:register-account-form
12+
Textfield Value Should Be id:email test
1413

1514
*** Keywords ***
1615
Before Test Suite

src/test/robotframework/collection/estimation/logic.robot

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,14 @@ Series with its price should be taken into account
1919
Submit Form id:add-series-form
2020
Go To ${SITE_URL}/collection/paid/estimation
2121
Table Cell Should Contain collection-estimation row=2 column=2 text=100.00 ${expectedCurrency}
22-
# FIXME: use "Table Footer Should Contain" instead, when it will be fixed.
23-
# See https://github.com/Hi-Fi/robotframework-seleniumlibrary-java/issues/88
24-
Table Header Should Contain collection-estimation 100.00 ${expectedCurrency}
22+
Table Footer Should Contain collection-estimation 100.00 ${expectedCurrency}
2523

2624
Series without price should be shown but not taken into account
2725
Go To ${SITE_URL}/series/2
2826
Submit Form id:add-series-form
2927
Go To ${SITE_URL}/collection/paid/estimation
3028
Table Cell Should Contain collection-estimation row=3 column=2 text=${EMPTY}
31-
# FIXME: use "Table Footer Should Contain" instead, when it will be fixed.
32-
# See https://github.com/Hi-Fi/robotframework-seleniumlibrary-java/issues/88
33-
Table Header Should Contain collection-estimation 100.00 ${expectedCurrency}
29+
Table Footer Should Contain collection-estimation 100.00 ${expectedCurrency}
3430

3531
*** Keywords ***
3632
Before Test Suite

src/test/robotframework/participant/creation/misc.robot

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
Documentation Verify miscellaneous aspects of participant creation
33
Library SeleniumLibrary
44
Resource ../../auth.steps.robot
5-
Resource ../../selenium.utils.robot
65
Suite Setup Before Test Suite
76
Suite Teardown Close Browser
87
Force Tags participant misc
@@ -13,7 +12,7 @@ Name and url should be stripped from leading and trailing spaces
1312
Input Text id:url ${SPACE * 2}url${SPACE * 2}
1413
Submit Form id:add-participant-form
1514
Textfield Value Should Be id:name f
16-
Urlfield Value Should Be id:url url
15+
Textfield Value Should Be id:url url
1716

1817
*** Keywords ***
1918
Before Test Suite

src/test/robotframework/selenium.utils.robot

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,6 @@ Element Text Should Match Regexp
88
${text}= Get Text ${locator}
99
Should Match Regexp ${text} ${regexp}
1010

11-
# Workaround for "Textfield Value Should Be" that causes NPE with <input type="url">:
12-
# https://github.com/Hi-Fi/robotframework-seleniumlibrary-java/issues/52
13-
Urlfield Value Should Be
14-
[Documentation] Verifies text field locator has exactly text expected
15-
[Arguments] ${locator} ${expected}
16-
${value}= Get Value ${locator}
17-
Should Be Equal ${expected} ${value}
18-
19-
# Workaround for "Textfield Value Should Be" that causes NPE with <input type="email">:
20-
# https://github.com/Hi-Fi/robotframework-seleniumlibrary-java/issues/52
21-
Emailfield Value Should Be
22-
[Documentation] Verifies text field locator has exactly text expected
23-
[Arguments] ${locator} ${expected}
24-
${value}= Get Value ${locator}
25-
Should Be Equal ${expected} ${value}
26-
2711
# We can't use "Select From List By Label" because
2812
# 1) it doesn't work with invisible elements (and selectize.js makes a field invisible)
2913
# 2) selectize.js dynamically creates a list of countries only when we click on a field

src/test/robotframework/series/import/request-logic.robot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Import series from an external site (in English, use category, country and date
2626
Should Be Equal ${country} Italy
2727
Should Be Empty ${quantity}
2828
Checkbox Should Be Selected id:perforated
29-
Urlfield Value Should Be id:image-url http://127.0.0.1:8080/image/1
29+
Textfield Value Should Be id:image-url http://127.0.0.1:8080/image/1
3030
Should Be Equal ${year} 2000
3131
Input Text id:quantity 1
3232
Submit Form id:create-series-form
@@ -64,7 +64,7 @@ Import series from an external site (in Russian, use description locator)
6464
Should Be Equal ${country} Italy
6565
Should Be Empty ${quantity}
6666
Checkbox Should Be Selected id:perforated
67-
Urlfield Value Should Be id:image-url http://localhost:8080/image/1
67+
Textfield Value Should Be id:image-url http://localhost:8080/image/1
6868
Should Be Equal ${year} 2000
6969

7070
Import series from external site with catalog numbers (use description locator)
@@ -107,7 +107,7 @@ Import series and series sale with a new seller from an external site
107107
${group}= Get Selected List Label id:seller-group
108108
Should Be Equal ${group} example.com
109109
Textfield Value Should Be id:seller-name Lando Livianus
110-
Urlfield Value Should Be id:seller-url http://example.com/lando-livianus
110+
Textfield Value Should Be id:seller-url http://example.com/lando-livianus
111111
Submit Form id:create-series-form
112112
# after importing a series, sale info should contain a new seller
113113
${currentDate}= Get Current Date result_format=%d.%m.%Y

src/test/robotframework/series/sales/import/logic.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Import a series sale with an existing seller
1313
Submit Form id:import-series-sale-form
1414
# the original field is emptied after successful request, so we wait for it
1515
Wait Until Element Value Is series-sale-url ${EMPTY}
16-
Urlfield Value Should Be id:url ${MOCK_SERVER}/series/sales/import/logic/existing-seller.html
16+
Textfield Value Should Be id:url ${MOCK_SERVER}/series/sales/import/logic/existing-seller.html
1717
List Selection Should Be id:seller Eicca Toppinen
1818
Textfield Value Should Be id:price 350
1919
List Selection Should Be id:currency RUB

src/test/robotframework/series/sales/misc.robot

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Force Tags series sales misc
99

1010
*** Test Cases ***
1111
Url should be stripped from leading and trailing spaces
12-
[Setup] Disable Client Validation
13-
Input Text id:url ${SPACE * 2}bad-value${SPACE * 2}
14-
Submit Form id:add-series-sales-form
15-
Urlfield Value Should Be id:url bad-value
12+
[Setup] Disable Client Validation
13+
Input Text id:url ${SPACE * 2}bad-value${SPACE * 2}
14+
Submit Form id:add-series-sales-form
15+
Textfield Value Should Be id:url bad-value
1616

1717
*** Keywords ***
1818
Before Test Suite

0 commit comments

Comments
 (0)