Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modernize Default Log In Page

Browse Source 
Fixes: gh-5515
This commit is contained in:
Rob Winch
2018-07-09 12:52:52 -05:00
parent a66b945ab7
commit 05ed028f9d
13 changed files with 384 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/boot/oauth2login/src/integration-test/java/org/springframework/security/samples/OAuth2LoginApplicationTests.java
View File

@@ -218,7 +218,7 @@ public class OAuth2LoginApplicationTests {
page = this.webClient.getPage(new URL(authorizationResponseUri));
assertThat(page.getBaseURL()).isEqualTo(loginErrorPageUrl);
HtmlElement errorElement = page.getBody().getFirstByXPath("p");
HtmlElement errorElement = page.getBody().getFirstByXPath("div");
assertThat(errorElement).isNotNull();
assertThat(errorElement.asText()).contains("authorization_request_not_found");
}
@@ -248,7 +248,7 @@ public class OAuth2LoginApplicationTests {
page = this.webClient.getPage(new URL(authorizationResponseUri));
assertThat(page.getBaseURL()).isEqualTo(loginErrorPageUrl);
HtmlElement errorElement = page.getBody().getFirstByXPath("p");
HtmlElement errorElement = page.getBody().getFirstByXPath("div");
assertThat(errorElement).isNotNull();
assertThat(errorElement.asText()).contains("authorization_request_not_found");
}
@@ -284,13 +284,13 @@ public class OAuth2LoginApplicationTests {
page = this.webClient.getPage(new URL(authorizationResponseUri));
assertThat(page.getBaseURL()).isEqualTo(loginErrorPageUrl);
HtmlElement errorElement = page.getBody().getFirstByXPath("p");
HtmlElement errorElement = page.getBody().getFirstByXPath("div");
assertThat(errorElement).isNotNull();
assertThat(errorElement.asText()).contains("invalid_redirect_uri_parameter");
}
private void assertLoginPage(HtmlPage page) throws Exception {
assertThat(page.getTitleText()).isEqualTo("Login Page");
assertThat(page.getTitleText()).isEqualTo("Please sign in");
int expectedClients = 4;

4
samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java
View File

@@ -37,7 +37,7 @@ public class LoginPage {
}
public LoginPage assertAt() {
assertThat(this.webDriver.getTitle()).isEqualTo("Login Page");
assertThat(this.webDriver.getTitle()).isEqualTo("Please sign in");
return this;
}
@@ -49,7 +49,7 @@ public class LoginPage {
private WebDriver webDriver;
private WebElement username;
private WebElement password;
@FindBy(css = "input[type=submit]")
@FindBy(css = "button[type=submit]")
private WebElement submit;
public LoginForm(WebDriver webDriver) {

4
samples/javaconfig/jdbc/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java
View File

@@ -37,7 +37,7 @@ public class LoginPage {
}
public LoginPage assertAt() {
assertThat(this.webDriver.getTitle()).isEqualTo("Login Page");
assertThat(this.webDriver.getTitle()).isEqualTo("Please sign in");
return this;
}
@@ -49,7 +49,7 @@ public class LoginPage {
private WebDriver webDriver;
private WebElement username;
private WebElement password;
@FindBy(css = "input[type=submit]")
@FindBy(css = "button[type=submit]")
private WebElement submit;
public LoginForm(WebDriver webDriver) {

4
samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java
View File

@@ -37,7 +37,7 @@ public class LoginPage {
}
public LoginPage assertAt() {
assertThat(this.webDriver.getTitle()).isEqualTo("Login Page");
assertThat(this.webDriver.getTitle()).isEqualTo("Please sign in");
return this;
}
@@ -49,7 +49,7 @@ public class LoginPage {
private WebDriver webDriver;
private WebElement username;
private WebElement password;
@FindBy(css = "input[type=submit]")
@FindBy(css = "button[type=submit]")
private WebElement submit;
public LoginForm(WebDriver webDriver) {

4
samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java
View File

@@ -37,7 +37,7 @@ public class LoginPage {
}
public LoginPage assertAt() {
assertThat(this.webDriver.getTitle()).isEqualTo("Login Page");
assertThat(this.webDriver.getTitle()).isEqualTo("Please sign in");
return this;
}
@@ -49,7 +49,7 @@ public class LoginPage {
private WebDriver webDriver;
private WebElement username;
private WebElement password;
@FindBy(css = "input[type=submit]")
@FindBy(css = "button[type=submit]")
private WebElement submit;
public LoginForm(WebDriver webDriver) {

4
samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java
View File

@@ -39,7 +39,7 @@ public class LoginPage {
}
public LoginPage assertAt() {
assertThat(this.webDriver.getTitle()).isEqualTo("Login Page");
assertThat(this.webDriver.getTitle()).isEqualTo("Please sign in");
return this;
}
@@ -51,7 +51,7 @@ public class LoginPage {
private WebDriver webDriver;
private WebElement username;
private WebElement password;
@FindBy(css = "input[type=submit]")
@FindBy(css = "button[type=submit]")
private WebElement submit;
public LoginForm(WebDriver webDriver) {

6
samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/LogoutPage.java
View File

@@ -27,8 +27,8 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Michael Simons
*/
public class LogoutPage extends LoginPage {
@FindBy(css = "p")
private WebElement p;
@FindBy(css = "div[role=alert]")
private WebElement alert;
public LogoutPage(WebDriver webDriver) {
super(webDriver);
@@ -38,7 +38,7 @@ public class LogoutPage extends LoginPage {
public LogoutPage assertAt() {
super.assertAt();
assertThat(p.getText()).isEqualTo("You have been logged out");
assertThat(this.alert.getText()).isEqualTo("You have been signed out");
return this;
}
}

4
samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java
View File

@@ -39,7 +39,7 @@ public class LoginPage {
}
public LoginPage assertAt() {
assertThat(this.webDriver.getTitle()).isEqualTo("Login Page");
assertThat(this.webDriver.getTitle()).isEqualTo("Please sign in");
return this;
}
@@ -51,7 +51,7 @@ public class LoginPage {
private WebDriver webDriver;
private WebElement username;
private WebElement password;
@FindBy(css = "input[type=submit]")
@FindBy(css = "button[type=submit]")
private WebElement submit;
public LoginForm(WebDriver webDriver) {

6
samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/LogoutPage.java
View File

@@ -27,8 +27,8 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Michael Simons
*/
public class LogoutPage extends LoginPage {
@FindBy(css = "p")
private WebElement p;
@FindBy(css = "div[role=alert]")
private WebElement alert;
public LogoutPage(WebDriver webDriver) {
super(webDriver);
@@ -38,7 +38,7 @@ public class LogoutPage extends LoginPage {
public LogoutPage assertAt() {
super.assertAt();
assertThat(p.getText()).isEqualTo("You have been logged out");
assertThat(this.alert.getText()).isEqualTo("You have been signed out");
return this;
}
}