From 3c207792ab427a4e6c1f513060d4e428c4fee124 Mon Sep 17 00:00:00 2001 From: Steve Riesenberg <5248162+sjohnr@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:32:59 -0600 Subject: [PATCH] Don't fail on javascript errors (cherry picked from commit 40d439c7953126f3c0b5dfcecbeef8f7850551d2) --- .../src/integTest/java/example/Saml2JavaConfigurationITests.java | 1 + .../src/integTest/java/example/CustomUrlsApplicationITests.java | 1 + .../src/integTest/java/example/Saml2LoginApplicationITests.java | 1 + .../src/integTest/java/example/Saml2LoginApplicationITests.java | 1 + .../src/integTest/java/example/Saml2LoginApplicationITests.java | 1 + .../java/example/SamlExtensionFederationApplicationITests.java | 1 + .../login-logout/src/integTest/java/example/Saml2XmlITests.java | 1 + 7 files changed, 7 insertions(+) diff --git a/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java b/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java index d3f3985cc..f68e395c2 100644 --- a/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java +++ b/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java @@ -69,6 +69,7 @@ void setup() { this.webClient = MockMvcWebClientBuilder.mockMvcSetup(this.mvc) .withDelegate(new LocalHostWebClient(this.environment)) .build(); + this.webClient.getOptions().setThrowExceptionOnScriptError(false); this.webClient.getCookieManager().clearCookies(); } diff --git a/servlet/spring-boot/java/saml2/custom-urls/src/integTest/java/example/CustomUrlsApplicationITests.java b/servlet/spring-boot/java/saml2/custom-urls/src/integTest/java/example/CustomUrlsApplicationITests.java index 310c5de2a..e0eb6fe78 100644 --- a/servlet/spring-boot/java/saml2/custom-urls/src/integTest/java/example/CustomUrlsApplicationITests.java +++ b/servlet/spring-boot/java/saml2/custom-urls/src/integTest/java/example/CustomUrlsApplicationITests.java @@ -52,6 +52,7 @@ public class CustomUrlsApplicationITests { @BeforeEach void setup() { + this.webClient.getOptions().setThrowExceptionOnScriptError(false); this.webClient.getCookieManager().clearCookies(); } diff --git a/servlet/spring-boot/java/saml2/login-single-tenant/src/integTest/java/example/Saml2LoginApplicationITests.java b/servlet/spring-boot/java/saml2/login-single-tenant/src/integTest/java/example/Saml2LoginApplicationITests.java index 7356c5234..86ec0fd4e 100644 --- a/servlet/spring-boot/java/saml2/login-single-tenant/src/integTest/java/example/Saml2LoginApplicationITests.java +++ b/servlet/spring-boot/java/saml2/login-single-tenant/src/integTest/java/example/Saml2LoginApplicationITests.java @@ -49,6 +49,7 @@ public class Saml2LoginApplicationITests { @BeforeEach void setup() { + this.webClient.getOptions().setThrowExceptionOnScriptError(false); this.webClient.getCookieManager().clearCookies(); } diff --git a/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java b/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java index 7356c5234..86ec0fd4e 100644 --- a/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java +++ b/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java @@ -49,6 +49,7 @@ public class Saml2LoginApplicationITests { @BeforeEach void setup() { + this.webClient.getOptions().setThrowExceptionOnScriptError(false); this.webClient.getCookieManager().clearCookies(); } diff --git a/servlet/spring-boot/java/saml2/refreshable-metadata/src/integTest/java/example/Saml2LoginApplicationITests.java b/servlet/spring-boot/java/saml2/refreshable-metadata/src/integTest/java/example/Saml2LoginApplicationITests.java index 0a7b59356..efadd3cc7 100644 --- a/servlet/spring-boot/java/saml2/refreshable-metadata/src/integTest/java/example/Saml2LoginApplicationITests.java +++ b/servlet/spring-boot/java/saml2/refreshable-metadata/src/integTest/java/example/Saml2LoginApplicationITests.java @@ -45,6 +45,7 @@ public class Saml2LoginApplicationITests { @BeforeEach void setup() { + this.webClient.getOptions().setThrowExceptionOnScriptError(false); this.webClient.getCookieManager().clearCookies(); } diff --git a/servlet/spring-boot/java/saml2/saml-extension-federation/src/integTest/java/example/SamlExtensionFederationApplicationITests.java b/servlet/spring-boot/java/saml2/saml-extension-federation/src/integTest/java/example/SamlExtensionFederationApplicationITests.java index f8b486e71..181709a16 100644 --- a/servlet/spring-boot/java/saml2/saml-extension-federation/src/integTest/java/example/SamlExtensionFederationApplicationITests.java +++ b/servlet/spring-boot/java/saml2/saml-extension-federation/src/integTest/java/example/SamlExtensionFederationApplicationITests.java @@ -54,6 +54,7 @@ public class SamlExtensionFederationApplicationITests { @BeforeEach void setup() { + this.webClient.getOptions().setThrowExceptionOnScriptError(false); this.webClient.getCookieManager().clearCookies(); } diff --git a/servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java b/servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java index 4f6f1d214..ffe404ff8 100644 --- a/servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java +++ b/servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java @@ -68,6 +68,7 @@ void setup() { this.webClient = MockMvcWebClientBuilder.mockMvcSetup(this.mvc) .withDelegate(new LocalHostWebClient(this.environment)) .build(); + this.webClient.getOptions().setThrowExceptionOnScriptError(false); this.webClient.getCookieManager().clearCookies(); }