Skip to content
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

XWIKI-22121: Improve the registration experience #3645

Merged
merged 1 commit into from
Nov 14, 2024
Merged

XWIKI-22121: Improve the registration experience #3645

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions ...-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/FormContainerElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
*/
public class FormContainerElement extends BaseElement
{
private static final String CLASS_ATTRIBUTE = "class";
private final WebElement formElement;

/**
Expand Down Expand Up @@ -77,6 +78,15 @@ public void fillFieldsByName(Map<String, String> valuesByNames)
valuesByElements.put(getFormElement().findElement(By.name(name)), valuesByNames.get(name));
}
fillFieldsByElements(valuesByElements);

/* Register password confirmation is usually the last element that needs to be validated by liveValidation.
This wait allows to solve a race condition between the form submission and the computation of the status of
those fields. We force the status to be solved before we try anything else, especially submitting the form.
*/
if (valuesByNames.containsKey("register2_password")) {
getDriver().waitUntilCondition(driver -> !getFormElement().findElement(By.name("register2_password"))
.getAttribute(CLASS_ATTRIBUTE).isEmpty());
}
}

public void fillFieldsByElements(Map<WebElement, String> valuesByElements)
Expand Down Expand Up @@ -113,7 +123,7 @@ public void setFieldValue(WebElement fieldElement, String value)
setCheckBox(fieldElement, value.equals("true"));
} else if ("select".equals(fieldElement.getTagName())) {
// if a select uses selectized then we should use a SuggestInputElement.
if (fieldElement.getAttribute("class").contains("selectized")) {
if (fieldElement.getAttribute(CLASS_ATTRIBUTE).contains("selectized")) {
SuggestInputElement suggestInputElement = new SuggestInputElement(fieldElement);
suggestInputElement.clearSelectedSuggestions();

Expand All @@ -135,7 +145,7 @@ public void setFieldValue(WebElement fieldElement, String value)
select.selectByValue(value);
}
} else {
List<String> classes = Arrays.asList(fieldElement.getAttribute("class").split("\\s+"));
List<String> classes = Arrays.asList(fieldElement.getAttribute(CLASS_ATTRIBUTE).split("\\s+"));
// If the field is a date time picker, calling sendKeys after clear triggers a focus and the field,
// and the picker fills the field with the current date and time before sendKeys is calls, leading to an
// invalid content field. In this case, we use a javascript expression to set the value without interacting
Expand Down
Loading