Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.4.x' 

fix flakey test in WebAuthnWebDriverTests

Closes gh-16464
This commit is contained in:
Rob Winch 2025-01-22 14:46:05 -06:00
parent 4ee9358900 028c212be4
commit 6149489b70
No known key found for this signature in database
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/src/integration-test/java/org/springframework/security/config/annotation/configurers/WebAuthnWebDriverTests.java
View File

@ -33,6 +33,7 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.openqa.selenium.By; import org.openqa.selenium.By;
import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.WebElement; import org.openqa.selenium.WebElement;
import org.openqa.selenium.chrome.ChromeDriverService; import org.openqa.selenium.chrome.ChromeDriverService;
import org.openqa.selenium.chrome.ChromeOptions; import org.openqa.selenium.chrome.ChromeOptions;
@ -273,12 +274,14 @@ class WebAuthnWebDriverTests {
/** /**
* Await until the assertion passes. If the assertion fails, it will display the * Await until the assertion passes. If the assertion fails, it will display the
* assertion error in stdout. * assertion error in stdout. WebDriver-related exceptions are ignored, so that
* {@code assertion}s can interact with the page and be retried on error, e.g.
* {@code assertThat(this.driver.findElement(By.Id("some-id")).isNotNull()}.
*/ */
private void await(Supplier<AbstractAssert<?, ?>> assertion) { private void await(Supplier<AbstractAssert<?, ?>> assertion) {
new FluentWait<>(this.driver).withTimeout(Duration.ofSeconds(2)) new FluentWait<>(this.driver).withTimeout(Duration.ofSeconds(2))
.pollingEvery(Duration.ofMillis(100)) .pollingEvery(Duration.ofMillis(100))
.ignoring(AssertionError.class) .ignoring(AssertionError.class, WebDriverException.class)
.until((d) -> { .until((d) -> {
assertion.get(); assertion.get();
return true; return true;