diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md index 2fb96cd0420..9366b286c8c 100644 --- a/testsuite/integration-arquillian/HOW-TO-RUN.md +++ b/testsuite/integration-arquillian/HOW-TO-RUN.md @@ -731,7 +731,7 @@ the same time both hosts must use different domains to be considered cross-origi Also, those new cookies policies are currently not yet enabled by default (which will change in the near future). To test those policies, you need the latest stable Firefox together with `firefox-strict-cookies` profile. This profile sets the browser to Firefox, configures the proper cookies behavior and makes Firefox to run in the headless mode (which is ok -because this is not UI testing). For debugging purposes you can override the headless mode with `-DfirefoxHeadless=false`. +because this is not UI testing). For debugging purposes you can override the headless mode with `-DfirefoxArguments=''`. **Broker tests:** diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index 0d759a741f1..c4d371bfef9 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -44,18 +44,19 @@ 1.8.0.Final 3.2.1 - 3.14.0 - 2.5.5 - 3.0.0-alpha.3 + 4.21.0 + 3.0.0-alpha.8 + 3.0.0-alpha.4 3.0.1.Final 1.0.1.Final 1.2.0.Beta3 ${undertow-jakarta.version} 1.0.0.Final 1.6.1 - 6.1.0 + 9.2.2 2.2.3 3.0.5 + 1.8.0 1.9.8.Final @@ -122,6 +123,11 @@ lift ${selenium.version} + + org.seleniumhq.selenium + selenium-manager + ${selenium.version} + @@ -154,6 +160,16 @@ selenium-remote-driver ${selenium.version} + + org.seleniumhq.selenium + htmlunit3-driver + ${selenium.version} + + + commons-validator + commons-validator + ${commons.validator.version} + org.jboss.arquillian diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index 595d24bcb57..cdbba92ddbe 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -42,7 +42,7 @@ **/cluster/**/*Test.java **/crossdc/**/*Test.java - 2.4.0.Final + 2.5.2.Final 1.19.0 ${basedir}/../../servers/auth-server/common 3.8.1 @@ -208,6 +208,11 @@ + + commons-validator + commons-validator + provided + diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakDronePostSetup.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakDronePostSetup.java index fce299df56c..285e0f83333 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakDronePostSetup.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakDronePostSetup.java @@ -56,7 +56,7 @@ public class KeycloakDronePostSetup { if (drone instanceof RemoteWebDriver) { RemoteWebDriver remoteWebDriver = (RemoteWebDriver) drone; - log.infof("Detected browser: %s %s", remoteWebDriver.getCapabilities().getBrowserName(), remoteWebDriver.getCapabilities().getVersion()); + log.infof("Detected browser: %s %s", remoteWebDriver.getCapabilities().getBrowserName(), remoteWebDriver.getCapabilities().getBrowserVersion()); webDriverProducer.set(remoteWebDriver); } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakWebDriverConfigurator.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakWebDriverConfigurator.java index 8abd122c624..67e7fcf4b41 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakWebDriverConfigurator.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakWebDriverConfigurator.java @@ -61,7 +61,6 @@ public class KeycloakWebDriverConfigurator { } private void acceptAllSSLCerts(WebDriverConfiguration webDriverCfg, DesiredCapabilities capabilitiesToAdd) { - capabilitiesToAdd.setCapability(CapabilityType.ACCEPT_SSL_CERTS, true); capabilitiesToAdd.setCapability(CapabilityType.ACCEPT_INSECURE_CERTS, true); } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPatternFlyAlert.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPatternFlyAlert.java index 943779b1c21..f71489698fb 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPatternFlyAlert.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPatternFlyAlert.java @@ -27,6 +27,8 @@ import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; +import java.time.Duration; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -66,7 +68,7 @@ public abstract class AbstractPatternFlyAlert { private static void waitUntilDisplayedOrHidden(boolean displayed) { ExpectedCondition condition = ExpectedConditions.visibilityOfElementLocated(By.className(ALERT_CLASS_NAME)); condition = displayed ? condition : ExpectedConditions.not(condition); - new WebDriverWait(getCurrentDriver(), PAGELOAD_TIMEOUT_MILLIS / 1000).until(condition); + new WebDriverWait(getCurrentDriver(), Duration.ofMillis(PAGELOAD_TIMEOUT_MILLIS)).until(condition); } public String getText() { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/BrowserTabUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/BrowserTabUtil.java index 7fc4144c2fa..a949b952d3a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/BrowserTabUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/BrowserTabUtil.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.util; -import com.gargoylesoftware.htmlunit.WebClient; +import org.htmlunit.WebClient; import org.jboss.arquillian.drone.webdriver.htmlunit.DroneHtmlUnitDriver; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UIUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UIUtils.java index f63e3decb2b..ca74840f498 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UIUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UIUtils.java @@ -17,6 +17,7 @@ import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.Select; import org.openqa.selenium.support.ui.WebDriverWait; +import java.time.Duration; import java.util.Optional; import java.util.function.Supplier; @@ -45,7 +46,7 @@ public final class UIUtils { public static boolean currentTitleEquals(String url) { try { - (new WebDriverWait(getCurrentDriver(), 5)).until(ExpectedConditions.titleIs(url)); + (new WebDriverWait(getCurrentDriver(), Duration.ofSeconds(5))).until(ExpectedConditions.titleIs(url)); } catch (TimeoutException e) { return false; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/URLUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/URLUtils.java index 705d824d4db..56a1bcb74ab 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/URLUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/URLUtils.java @@ -9,6 +9,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.WebDriverWait; import java.net.URI; +import java.time.Duration; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -90,7 +91,7 @@ public final class URLUtils { WebDriver driver = getCurrentDriver(); try { - (new WebDriverWait(driver, 5, 100)).until(condition); + (new WebDriverWait(driver, Duration.ofSeconds(5), Duration.ofMillis(100))).until(condition); } catch (TimeoutException e) { return false; } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java index 642015e7411..4ff709683fa 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java @@ -78,7 +78,7 @@ public final class WaitUtils { } public static void waitUntilElementClassContains(WebElement element, String value) { - new WebDriverWait(getCurrentDriver(), 1).until( + new WebDriverWait(getCurrentDriver(), Duration.ofSeconds(1)).until( ExpectedConditions.attributeContains(element, "class", value) ); } @@ -105,7 +105,7 @@ public final class WaitUtils { return; // not needed } - WebDriverWait wait = new WebDriverWait(driver, PAGELOAD_TIMEOUT_MILLIS / 1000); + WebDriverWait wait = new WebDriverWait(driver, Duration.ofMillis(PAGELOAD_TIMEOUT_MILLIS)); try { wait diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java index b7709f70f3c..58eddbdd32f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java @@ -369,11 +369,6 @@ public abstract class AbstractFirstBrokerLoginTest extends AbstractInitializedBa // Click browser 'back' on review profile page idpConfirmLinkPage.clickReviewProfile(); - // Need to confirm again with htmlUnit due the JS not working correctly - if (driver instanceof HtmlUnitDriver) { - idpConfirmLinkPage.assertCurrent(); - idpConfirmLinkPage.clickReviewProfile(); - } waitForPage(driver, "update account information", false); updateAccountInformationPage.assertCurrent(); driver.navigate().back(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerTestTools.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerTestTools.java index 0c622ef787a..57943e85573 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerTestTools.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerTestTools.java @@ -14,6 +14,7 @@ import org.openqa.selenium.support.ui.WebDriverWait; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URLEncoder; +import java.time.Duration; import java.util.Collections; import java.util.List; import java.util.Map; @@ -62,7 +63,7 @@ public class BrokerTestTools { public static void waitForPage(final WebDriver driver, final String title, final boolean isHtmlTitle) { waitForPageToLoad(); - WebDriverWait wait = new WebDriverWait(driver, 5); + WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(5)); ExpectedCondition condition = new ExpectedCondition() { private String actualTitle = null; @@ -89,7 +90,7 @@ public class BrokerTestTools { } public static void waitForElementEnabled(WebDriver driver, final String elementName) { - WebDriverWait wait = new WebDriverWait(driver, 5); + WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(5)); ExpectedCondition condition = (WebDriver input) -> { List elements = input.findElements(By.name(elementName)); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java index 65c993b20dc..671a0139023 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java @@ -39,6 +39,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.nio.charset.Charset; +import java.time.Duration; import java.util.List; import java.util.Map; import java.util.Properties; @@ -190,7 +191,7 @@ public class KcSamlIdPInitiatedSsoTest extends AbstractKeycloakTest { } private void waitForPage(final String title, final boolean htmlTitle) { - WebDriverWait wait = new WebDriverWait(driver, 5); + WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(5)); ExpectedCondition condition = (WebDriver input) -> htmlTitle ? input.getTitle().toLowerCase().contains(title) : PageUtils.getPageTitle(input).toLowerCase().contains(title); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java index e508c9749d7..1204d9ba4cd 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.oauth; import com.fasterxml.jackson.databind.JsonNode; -import com.gargoylesoftware.htmlunit.WebClient; +import org.htmlunit.WebClient; import java.io.Closeable; import org.hamcrest.CoreMatchers; import org.jboss.arquillian.drone.webdriver.htmlunit.DroneHtmlUnitDriver; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java index 195af0672f4..5419181294a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java @@ -65,6 +65,7 @@ import org.keycloak.testsuite.util.DroneUtils; import org.keycloak.testsuite.util.PhantomJSBrowser; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.userprofile.UserProfileConstants; import org.openqa.selenium.WebDriver; @@ -573,6 +574,8 @@ public abstract class AbstractX509AuthenticationTest extends AbstractTestRealmKe loginConfirmationPage.open(); + WaitUtils.waitForPageToLoad(); + Assert.assertTrue(loginConfirmationPage.getSubjectDistinguishedNameText().startsWith("EMAILADDRESS=test-user@localhost")); Assert.assertEquals(username, loginConfirmationPage.getUsernameText()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml index e776bd764c9..1b201f2f7cd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml @@ -36,7 +36,7 @@ ${firefoxLegacyDriver} ${firefoxDriverVersion} ${firefoxUserPreferences} - ${firefoxHeadless} + ${firefoxArguments} ${chromeBinary} @@ -83,7 +83,7 @@ ${firefoxLegacyDriver} ${firefoxDriverVersion} ${firefoxUserPreferences} - ${firefoxHeadless} + ${firefoxArguments} ${chromeBinary} diff --git a/testsuite/integration-arquillian/tests/other/webauthn/pom.xml b/testsuite/integration-arquillian/tests/other/webauthn/pom.xml index 6a1eadde992..509477a0e49 100644 --- a/testsuite/integration-arquillian/tests/other/webauthn/pom.xml +++ b/testsuite/integration-arquillian/tests/other/webauthn/pom.xml @@ -13,38 +13,17 @@ WebAuthn tests - 4.1.0 - 3.0.0-alpha.3 - 3.58.0 - 3.0.0-alpha.4 - ${project.build.directory}/dependency/firefox-user-preferences.js - - 4.1.2 + ${project.build.directory}/dependency/firefox-user-preferences.js + 17 + 17 + 17 - - org.jboss.arquillian.extension - arquillian-drone-bom - ${arquillian.drone.version} - pom - - - org.jboss.arquillian.extension - arquillian-drone-webdriver - ${arquillian.drone.version} - provided - - - org.jboss.arquillian.graphene - graphene-webdriver - ${graphene.webdriver.version} - pom - org.seleniumhq.selenium - htmlunit-driver - ${htmlunit.driver.version} + htmlunit3-driver + ${selenium.version} @@ -68,13 +47,6 @@ firefox - - - org.seleniumhq.selenium - selenium-firefox-driver - ${selenium.firefox.driver.version} - - diff --git a/testsuite/integration-arquillian/tests/other/webauthn/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/ContentAlert.java b/testsuite/integration-arquillian/tests/other/webauthn/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/ContentAlert.java index f96051bd703..0602f569c75 100644 --- a/testsuite/integration-arquillian/tests/other/webauthn/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/ContentAlert.java +++ b/testsuite/integration-arquillian/tests/other/webauthn/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/ContentAlert.java @@ -17,7 +17,6 @@ package org.keycloak.testsuite.webauthn.pages.fragments; -import org.jboss.arquillian.graphene.fragment.Root; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.TimeoutException; @@ -32,17 +31,25 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElementIsNotPresent /** * @author Vaclav Muzikar + * + * Page fragments seem not to be working after migration from CGlib to ByteBuddy in Graphene */ public class ContentAlert { - private static final String ROOT_ID = "//ul[@data-testid='alerts']/li[1]"; + private static final String ROOT_ID = "//ul[@data-testid='alerts']/li[1]//div"; //The first alert from the alert group is what we are interested in. - @FindBy(xpath = ROOT_ID + "//div") - private AlertElement alertElement; + @FindBy(xpath = ROOT_ID) + private WebElement alertElementRoot; + + @FindBy(className = ROOT_ID + "[@class='pf-v5-c-alert__title']") + private WebElement messageElement; + + @FindBy(className = ROOT_ID + "[@class='pf-v5-c-alert__action']") + private WebElement closeBtn; public boolean isDisplayed() { try { - return alertElement.getRoot().isDisplayed(); + return alertElementRoot.isDisplayed(); } catch (NoSuchElementException e) { return false; @@ -62,16 +69,16 @@ public class ContentAlert { } public String getMessage() { - return getTextFromElement(alertElement.getMessageElement()); + return getTextFromElement(messageElement); } public void close() { - alertElement.getCloseBtn().click(); + closeBtn.click(); assertIsNotDisplayed(); } protected void assertAlertType(String type) { - assertTrue("Alert is not " + type, doesElementClassContain(alertElement.getRoot(), type)); + assertTrue("Alert is not " + type, doesElementClassContain(alertElementRoot, type)); } protected void assertMessage(String expectedMessage) { @@ -113,31 +120,4 @@ public class ContentAlert { assertInfo(); assertMessage(expectedMessage); } - - /** - * Elements are placed into a separate class to leverage Page Fragment functionality so that all elements are found - * under the Root element. - */ - private class AlertElement { - @Root - private WebElement root; - - @FindBy(className = "pf-v5-c-alert__title") - private WebElement messageElement; - - @FindBy(className = "pf-v5-c-alert__action") - private WebElement closeBtn; - - public WebElement getRoot() { - return root; - } - - public WebElement getMessageElement() { - return messageElement; - } - - public WebElement getCloseBtn() { - return closeBtn; - } - } -} +} \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/registration/PubKeySignRegisterTest.java b/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/registration/PubKeySignRegisterTest.java index df60b2ca145..05439566688 100644 --- a/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/registration/PubKeySignRegisterTest.java +++ b/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/registration/PubKeySignRegisterTest.java @@ -16,7 +16,6 @@ */ package org.keycloak.testsuite.webauthn.registration; -import com.beust.jcommander.internal.Lists; import com.webauthn4j.data.attestation.authenticator.COSEKey; import com.webauthn4j.data.attestation.statement.COSEAlgorithmIdentifier; import org.junit.Test; @@ -46,12 +45,12 @@ public class PubKeySignRegisterTest extends AbstractWebAuthnVirtualTest { @Test public void publicKeySignaturesWrong() { - assertPublicKeyAlgorithms(false, null, Lists.newArrayList(RS512, ES512)); + assertPublicKeyAlgorithms(false, null, List.of(RS512, ES512)); } @Test public void publicKeySignaturesAlternatives() { - assertPublicKeyAlgorithms(true, COSEAlgorithmIdentifier.ES256, Lists.newArrayList(ES256, ES512)); + assertPublicKeyAlgorithms(true, COSEAlgorithmIdentifier.ES256, List.of(ES256, ES512)); } @Test @@ -61,7 +60,7 @@ public class PubKeySignRegisterTest extends AbstractWebAuthnVirtualTest { @Test public void publicKeySignaturesRSA() { - assertPublicKeyAlgorithms(false, null, Lists.newArrayList(RS384, ES512)); + assertPublicKeyAlgorithms(false, null, List.of(RS384, ES512)); } @Test diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index 43564e79ed8..5f55c476fe6 100644 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -215,15 +215,15 @@ Win32 chrome - --headless + --headless --ignore-ssl-errors=yes --ignore-certificate-errors chrome false - true + -headless - --headless --window-size=1920,1080 --remote-allow-origins=* + --headless --window-size=1920,1080 --remote-allow-origins=* --ignore-ssl-errors=yes --ignore-certificate-errors @@ -600,7 +600,7 @@ ${firefoxLegacyDriver} ${firefoxDriverVersion} ${firefoxUserPreferences} - ${firefoxHeadless} + ${firefoxArguments} ${appium.platformName} ${appium.deviceName} @@ -1862,17 +1862,6 @@ - - - - - org.seleniumhq.selenium - htmlunit-driver - 2.27 - - - - @@ -2077,7 +2066,7 @@ firefox firefox ${project.build.directory}/dependency/firefox-cookies-prefs.js - true + -headless true