Merge branch '6.2.x' into 6.3.x
This commit is contained in:
@@ -106,6 +106,7 @@ public class OAuth2LoginApplicationTests {
|
||||
@BeforeEach
|
||||
void setup() {
|
||||
this.webClient.getCookieManager().clearCookies();
|
||||
this.webClient.getOptions().setThrowExceptionOnScriptError(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -28,6 +28,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -42,6 +43,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
|
||||
|
||||
@SpringBootTest
|
||||
@AutoConfigureMockMvc
|
||||
@Disabled("gh-127")
|
||||
public class CustomUrlsApplicationITests {
|
||||
|
||||
@Autowired
|
||||
|
||||
@@ -28,6 +28,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -39,6 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
@SpringBootTest
|
||||
@AutoConfigureMockMvc
|
||||
@Disabled("gh-127")
|
||||
public class Saml2LoginApplicationITests {
|
||||
|
||||
@Autowired
|
||||
@@ -51,6 +53,7 @@ public class Saml2LoginApplicationITests {
|
||||
void setup() {
|
||||
this.webClient.getOptions().setThrowExceptionOnScriptError(false);
|
||||
this.webClient.getCookieManager().clearCookies();
|
||||
this.webClient.getOptions().setThrowExceptionOnScriptError(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -28,6 +28,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -39,6 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
@SpringBootTest
|
||||
@AutoConfigureMockMvc
|
||||
@Disabled("gh-127")
|
||||
public class Saml2LoginApplicationITests {
|
||||
|
||||
@Autowired
|
||||
@@ -51,6 +53,7 @@ public class Saml2LoginApplicationITests {
|
||||
void setup() {
|
||||
this.webClient.getOptions().setThrowExceptionOnScriptError(false);
|
||||
this.webClient.getCookieManager().clearCookies();
|
||||
this.webClient.getOptions().setThrowExceptionOnScriptError(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -24,6 +24,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -35,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
@SpringBootTest
|
||||
@AutoConfigureMockMvc
|
||||
@Disabled("gh-127")
|
||||
public class Saml2LoginApplicationITests {
|
||||
|
||||
@Autowired
|
||||
@@ -47,6 +49,7 @@ public class Saml2LoginApplicationITests {
|
||||
void setup() {
|
||||
this.webClient.getOptions().setThrowExceptionOnScriptError(false);
|
||||
this.webClient.getCookieManager().clearCookies();
|
||||
this.webClient.getOptions().setThrowExceptionOnScriptError(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user