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

Jump to bottom

[Backport stable-16.10.x] XWIKI-22680: Regression on createAndDeleteUser #3680

Merged
merged 1 commit into from
Nov 22, 2024
Merged

[Backport stable-16.10.x] XWIKI-22680: Regression on createAndDeleteUser #3680

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions ...pageobjects/src/main/java/org/xwiki/administration/test/po/ResetPasswordCompletePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ public String getPasswordConfirmation()
public void setPasswordConfirmation(String newPasswordConfirmation)
{
this.newPasswordConfirmationField.sendKeys(newPasswordConfirmation);
getDriver().waitUntilCondition(
driver -> !this.newPasswordConfirmationField.getAttribute("class").isEmpty()
);
}

public ResetPasswordCompletePage clickSave()
Expand Down
17 changes: 11 additions & 6 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 @@ -73,20 +73,25 @@ protected WebElement getFormElement()

public void fillFieldsByName(Map<String, String> valuesByNames)
{
Map<WebElement, String> valuesByElements = new LinkedHashMap<>((int) (valuesByNames.size() / 0.75));

Map<WebElement, String> valuesByElements = new LinkedHashMap<>();

WebElement lastElement = null;
for (String name : valuesByNames.keySet()) {
valuesByElements.put(getFormElement().findElement(By.name(name)), valuesByNames.get(name));
lastElement = getFormElement().findElement(By.name(name));
valuesByElements.put(lastElement, 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.
Unfortunately in Java17 we do not have lastEntry() from LinkedHashMaps,
so we use a few non optimized operations instead.
This is okay because the Map should not contain a lot of elements.
*/
if (valuesByNames.containsKey("register2_password")) {
getDriver().waitUntilCondition(driver -> !getFormElement().findElement(By.name("register2_password"))
.getAttribute(CLASS_ATTRIBUTE).isEmpty());
if(!valuesByElements.isEmpty() && lastElement != null) {
WebElement finalLastElement = lastElement;
getDriver().waitUntilCondition(driver -> !finalLastElement.getAttribute(CLASS_ATTRIBUTE).isEmpty());
}
}

Expand Down
1 change: 1 addition & 0 deletions ...ser-profile-test-pageobjects/src/main/java/org/xwiki/user/test/po/ChangePasswordPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public void changePassword(String originalPassword, String password, String pass
this.password1.sendKeys(password);
this.password2.clear();
this.password2.sendKeys(password2);
getDriver().waitUntilElementHasNonEmptyAttributeValue(By.xpath("//input[@id='xwikipassword2']"),"class");
}

/**
Expand Down
Loading