chore: use a global keyword for disabling client validation.

php-coder · php-coder · commit c3940f2e7792 · 2020-06-26T19:04:39.000+01:00
HtmlUnit/htmlunit#75 has been fixed and we can use "novalidate" attribute to turn off validation of a particular form. Follow-up to #1251
diff --git a/src/test/robotframework/account/activation/misc-anonymous.robot b/src/test/robotframework/account/activation/misc-anonymous.robot
@@ -4,7 +4,7 @@ Library          SeleniumLibrary
 Resource         ../../selenium.utils.robot
 Suite Setup      Before Test Suite
 Suite Teardown   Close Browser
-Test Setup       Disable Client Validation
+Test Setup       Disable Client Validation  activate-account-form
 Force Tags       account  activation  misc
 
 *** Test Cases ***
@@ -58,13 +58,9 @@ Before Test Suite
 	Open Browser                        ${SITE_URL}/account/activate  ${BROWSER}
 	Register Keyword To Run On Failure  Log Source
 
-Disable Client Validation
-	Remove Element Attribute  password              required
-	Remove Element Attribute  passwordConfirmation  required
-
 Name should not cause an error
 	[Arguments]                      ${name}
-	Disable Client Validation
+	Disable Client Validation        activate-account-form
 	Input Text                       id:name  ${name}
 	Submit Form                      id:activate-account-form
 	Page Should Not Contain Element  id:name.errors
diff --git a/src/test/robotframework/account/activation/validation.robot b/src/test/robotframework/account/activation/validation.robot
@@ -4,7 +4,7 @@ Library         SeleniumLibrary
 Resource        ../../selenium.utils.robot
 Suite Setup     Before Test Suite
 Suite Teardown  Close Browser
-Test Setup      Disable Client Validation
+Test Setup      Disable Client Validation  activate-account-form
 Force Tags      account  activation  validation
 
 *** Test Cases ***
@@ -105,15 +105,9 @@ Before Test Suite
 	Open Browser                        ${SITE_URL}/account/activate  ${BROWSER}
 	Register Keyword To Run On Failure  Log Source
 
-Disable Client Validation
-	Remove Element Attribute  login                 required
-	Remove Element Attribute  password              required
-	Remove Element Attribute  passwordConfirmation  required
-	Remove Element Attribute  activationKey         required
-
 Login should not contain repeated special characters
 	[Arguments]                ${login}
-	Disable Client Validation
+	Disable Client Validation  activate-account-form
 	Input Text                 id:login         ${login}
 	Submit Form                id:activate-account-form
 	Element Text Should Be     id:login.errors  Login must not contain repetition of hyphen, dot or underscore
diff --git a/src/test/robotframework/account/authentication/validation.robot b/src/test/robotframework/account/authentication/validation.robot
@@ -8,7 +8,7 @@ Force Tags      account  authentication  validation
 
 *** Test Cases ***
 Authenticate with empty credentials
-	[Setup]                 Disable Client Validation
+	[Setup]                 Disable Client Validation  auth-account-form
 	Input Text              id:login        ${EMPTY}
 	Input Text              id:password     ${EMPTY}
 	Submit Form             id:auth-account-form
@@ -25,7 +25,3 @@ Before Test Suite
 	Open Browser                        ${SITE_URL}/account/auth  ${BROWSER}
 	Register Keyword To Run On Failure  Log Source
 
-Disable Client Validation
-	Remove Element Attribute  login     required
-	Remove Element Attribute  password  required
-
diff --git a/src/test/robotframework/collection/add-series/validation.robot b/src/test/robotframework/collection/add-series/validation.robot
@@ -9,7 +9,7 @@ Force Tags       collection  validation
 
 *** Test Cases ***
 Add a series without required field
-	[Setup]                 Disable Client Validation
+	[Setup]                 Disable Client Validation  add-series-form
 	Input Text              id:number-of-stamps  ${EMPTY}
 	Submit Form             id:add-series-form
 	Element Text Should Be  id:number-of-stamps.errors  Value must not be empty
@@ -33,6 +33,3 @@ Before Test Suite
 	# We need a series with more than 1 stamp, so the number-of-stamps field won't be hidden.
 	# We also need a series with no more than 4 stamps, so the 5 stamps will lead to an error.
 	Go To                               ${SITE_URL}/series/2
-
-Disable Client Validation
-	Remove Element Attribute  number-of-stamps  required
diff --git a/src/test/robotframework/participant/creation/validation.robot b/src/test/robotframework/participant/creation/validation.robot
@@ -9,7 +9,7 @@ Force Tags       participant  validation
 
 *** Test Cases ***
 Create participant with blank required fields
-	[Setup]                 Disable Client Validation
+	[Setup]                 Disable Client Validation  add-participant-form
 	Submit Form             id:add-participant-form
 	Element Text Should Be  id:name.errors  Value must not be empty
 
@@ -37,6 +37,3 @@ Before Test Suite
 	Register Keyword To Run On Failure  Log Source
 	Log In As                           login=admin  password=test
 	Go To                               ${SITE_URL}/participant/add
-
-Disable Client Validation
-	Remove Element Attribute  name  required
diff --git a/src/test/robotframework/selenium.utils.robot b/src/test/robotframework/selenium.utils.robot
@@ -52,7 +52,7 @@ Select Random Option From List
 	${randomIndex}=            Evaluate  random.randint(0, ${size}-1)  modules=random
 	Select From List By Index  ${locator}  ${randomIndex}
 
-Remove Element Attribute
-	[Documentation]     Remove an attribute with a specified name from an element identified by its id
-	[Arguments]         ${id}  ${name}
-	Execute Javascript  return window.document.getElementById('${id}').removeAttribute('${name}');
+Disable Client Validation
+	[Documentation]     Disable client validation for a form with a specified ID
+	[Arguments]         ${id}
+	Execute Javascript  return window.document.getElementById('${id}').setAttribute('novalidate', 'true');
diff --git a/src/test/robotframework/series/creation/misc-admin.robot b/src/test/robotframework/series/creation/misc-admin.robot
@@ -9,7 +9,7 @@ Force Tags       series  misc
 
 *** Test Cases ***
 Comment should be stripped from leading and trailing spaces
-	Disable Client Validation
+	Disable Client Validation  add-series-form
 	Click Element              id:add-comment-link
 	Input Text                 id:comment  ${SPACE * 2}example comment${SPACE * 2}
 	Submit Form                id:add-series-form
@@ -21,6 +21,3 @@ Before Test Suite
 	Register Keyword To Run On Failure  Log Source
 	Log In As                           login=admin  password=test
 	Go To                               ${SITE_URL}/series/add
-
-Disable Client Validation
-	Remove Element Attribute  quantity  required
diff --git a/src/test/robotframework/series/creation/misc-user.robot b/src/test/robotframework/series/creation/misc-user.robot
@@ -29,7 +29,7 @@ Catalog numbers should accept valid values
 
 Catalog numbers should be stripped from any spaces
 	Go To                          ${SITE_URL}/series/add
-	Disable Client Validation
+	Disable Client Validation      add-series-form
 	Click Element                  id:add-catalog-numbers-link
 	Wait Until Element Is Visible  id:michelNumbers
 	Input Text                     id:michelNumbers    ${SPACE * 2}1 , 2${SPACE * 2}
@@ -93,14 +93,10 @@ Before Test Suite
 	Log In As                           login=coder  password=test
 	Go To                               ${SITE_URL}/series/add
 
-Disable Client Validation
-	Remove Element Attribute  quantity  required
-	Remove Element Attribute  image     required
-
 Valid Catalog Numbers Should Be Accepted
 	[Arguments]                      ${catalogNumbers}
 	Go To                            ${SITE_URL}/series/add
-	Disable Client Validation
+	Disable Client Validation        add-series-form
 	Click Element                    id:add-catalog-numbers-link
 	Wait Until Element Is Visible    id:michelNumbers
 	Input Text                       id:michelNumbers    ${catalogNumbers}
diff --git a/src/test/robotframework/series/creation/validation-admin.robot b/src/test/robotframework/series/creation/validation-admin.robot
@@ -5,7 +5,7 @@ Resource         ../../auth.steps.robot
 Resource         ../../selenium.utils.robot
 Suite Setup      Before Test Suite
 Suite Teardown   Close Browser
-Test Setup       Disable Client Validation
+Test Setup       Disable Client Validation  add-series-form
 Force Tags       series  validation
 
 *** Test Cases ***
@@ -67,6 +67,3 @@ Before Test Suite
 	Register Keyword To Run On Failure  Log Source
 	Log In As                           login=admin  password=test
 	Go To                               ${SITE_URL}/series/add
-
-Disable Client Validation
-	Remove Element Attribute  quantity  required
diff --git a/src/test/robotframework/series/creation/validation-user.robot b/src/test/robotframework/series/creation/validation-user.robot
@@ -5,7 +5,7 @@ Resource         ../../auth.steps.robot
 Resource         ../../selenium.utils.robot
 Suite Setup      Before Test Suite
 Suite Teardown   Close Browser
-Test Setup       Disable Client Validation
+Test Setup       Disable Client Validation  add-series-form
 Force Tags       series  validation
 
 *** Test Cases ***
@@ -61,10 +61,6 @@ Before Test Suite
 	Log In As                           login=coder  password=test
 	Go To                               ${SITE_URL}/series/add
 
-Disable Client Validation
-	Remove Element Attribute  quantity  required
-	Remove Element Attribute  image     required
-
 Invalid Catalog Numbers Should Be Rejected
 	[Arguments]                    ${catalogNumbers}
 	# open page each time to be sure that we're starting from the clean state.
@@ -73,7 +69,7 @@ Invalid Catalog Numbers Should Be Rejected
 	# invisible (because link is toggling the visibility and when there are
 	# errors, fields are visible from the begining).
 	Go To                          ${SITE_URL}/series/add
-	Disable Client Validation
+	Disable Client Validation      add-series-form
 	Click Element                  id:add-catalog-numbers-link
 	# we should wait until all 4 fields with class js-catalogs-info will be
 	# visible but for simplicity we just check that the last field is visible
@@ -103,7 +99,7 @@ Invalid Catalog Price Should Be Rejected
 	# invisible (because link is toggling the visibility and when there are
 	# errors, fields are visible from the begining).
 	Go To                          ${SITE_URL}/series/add
-	Disable Client Validation
+	Disable Client Validation      add-series-form
 	Click Element                  id:add-catalog-numbers-link
 	# we should wait until all 4 fields with class js-catalogs-info will be
 	# visible but for simplicity we just check that the last field is visible
diff --git a/src/test/robotframework/series/import/request-validation.robot b/src/test/robotframework/series/import/request-validation.robot
@@ -9,7 +9,7 @@ Force Tags       series  import-series  validation
 
 *** Test Cases ***
 Submit request with blank required field
-	[Setup]                 Disable Client Validation
+	[Setup]                 Disable Client Validation  import-series-form
 	Submit Form             id:import-series-form
 	Element Text Should Be  id:url.errors  Value must not be empty
 
@@ -30,6 +30,3 @@ Before Test Suite
 	Register Keyword To Run On Failure  Log Source
 	Log In As                           login=admin  password=test
 	Go To                               ${SITE_URL}/series/import/request
-
-Disable Client Validation
-	Remove Element Attribute  url  required
diff --git a/src/test/robotframework/series/sales/import/validation.robot b/src/test/robotframework/series/sales/import/validation.robot
@@ -10,7 +10,7 @@ Force Tags      series  sales  import-sales  validation
 
 *** Test Cases ***
 Import a series sale with empty required field
-	Disable Client Validation
+	Disable Client Validation      import-series-sale-form
 	Submit Form                    id:import-series-sale-form
 	Wait Until Element Is Visible  id:series-sale-url.errors
 	Element Text Should Be         id:series-sale-url.errors  Value must not be empty
@@ -36,6 +36,3 @@ Before Test Suite
 
 Before Test
 	Go To  ${SITE_URL}/series/1
-
-Disable Client Validation
-	Remove Element Attribute  series-sale-url  required
diff --git a/src/test/robotframework/series/sales/misc.robot b/src/test/robotframework/series/sales/misc.robot
@@ -9,7 +9,7 @@ Force Tags       series  sales  misc
 
 *** Test Cases ***
 Url should be stripped from leading and trailing spaces
-	[Setup]                    Disable Client Validation
+	[Setup]                    Disable Client Validation  add-series-sales-form
 	Input Text                 id:url  ${SPACE * 2}bad-value${SPACE * 2}
 	Submit Form                id:add-series-sales-form
 	Textfield Value Should Be  id:url  bad-value
@@ -20,6 +20,3 @@ Before Test Suite
 	Register Keyword To Run On Failure  Log Source
 	Log In As                           login=admin  password=test
 	Go To                               ${SITE_URL}/series/1
-
-Disable Client Validation
-	Remove Element Attribute  price  required
diff --git a/src/test/robotframework/series/sales/validation.robot b/src/test/robotframework/series/sales/validation.robot
@@ -5,7 +5,7 @@ Resource         ../../auth.steps.robot
 Resource         ../../selenium.utils.robot
 Suite Setup      Before Test Suite
 Suite Teardown   Close Browser
-Test Setup       Disable Client Validation
+Test Setup       Disable Client Validation  add-series-sales-form
 Force Tags       series  sales  validation
 
 *** Test Cases ***
@@ -40,6 +40,3 @@ Before Test Suite
 	Register Keyword To Run On Failure  Log Source
 	Log In As                           login=admin  password=test
 	Go To                               ${SITE_URL}/series/1
-
-Disable Client Validation
-	Remove Element Attribute  price  required
diff --git a/src/test/robotframework/series/search/validation.robot b/src/test/robotframework/series/search/validation.robot
@@ -8,14 +8,11 @@ Force Tags      series  search  validation
 
 *** Test Cases ***
 Search the series with empty required field
-	[Setup]                 Disable Client Validation
+	[Setup]                 Disable Client Validation  search-series-form
 	Submit Form             id:search-series-form
 	Element Text Should Be  id:catalogNumber.errors  Value must not be empty
 
 *** Keywords ***
 Before Test Suite
 	Open Browser                        ${SITE_URL}/  ${BROWSER}
 	Register Keyword To Run On Failure  Log Source
-
-Disable Client Validation
-	Remove Element Attribute  catalogNumber  required
