tested sign up features, checked for empty credentials

makersacademy · somunachima · Nov 14, 2023 · Nov 14, 2023 · Nov 14, 2023 · Nov 14, 2023
commit 95c4d7de68638fb2f8144402cea3a753805e9b48
diff --git a/src/main/java/com/makersacademy/acebook/controller/UsersController.java b/src/main/java/com/makersacademy/acebook/controller/UsersController.java
@@ -12,10 +12,14 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.view.RedirectView;
 
+import java.util.ArrayList;
 import java.util.Optional;
 
+import static java.lang.Boolean.valueOf;
+
 @Controller
 public class UsersController {
 
@@ -31,7 +35,23 @@ public String signup(Model model) {
     }
 
     @PostMapping("/users")
-    public RedirectView signup(@ModelAttribute User user) {
+    public RedirectView signup(@ModelAttribute User user, RedirectAttributes attributes) {
+
+        String usernameErrorMsg = "Please enter a username";
+        String passwordErrorMsg = "Please enter a password";
+
+        if (user.getUsername().trim().isEmpty() && user.getPassword().trim().isEmpty()){
+            attributes.addAttribute("usernameError", usernameErrorMsg);
+            attributes.addAttribute("passwordError", passwordErrorMsg);
+            return new RedirectView("/users/new");
+        } else if (user.getPassword().trim().isEmpty()) {
+            attributes.addAttribute("passwordError", passwordErrorMsg);
+            return new RedirectView("/users/new");
+        } else if (user.getUsername().trim().isEmpty()) {
+            attributes.addAttribute("usernameError", usernameErrorMsg);
+            return new RedirectView("/users/new");
+        }
+
         userRepository.save(user);
         Authority authority = new Authority(user.getUsername(), "ROLE_USER");
         authoritiesRepository.save(authority);

diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
@@ -1,6 +1,6 @@
 <html xmlns:th="http://www.thymeleaf.org" xmlns:tiles="http://www.thymeleaf.org">
 <head>
-    <title tiles:fragment="title">Messages : Create</title>
+    <title tiles:fragment="title">Please log in</title>
 </head>
 <body>
 <div tiles:fragment="content">
@@ -24,7 +24,7 @@
     </form>
     <form name="f" th:action="@{/users/new}" method="get">
         <div>
-            <button type="submit" class="btn">Sign up</button>
+            <button id="sign-up-btn" type="submit" class="btn">Sign up</button>
         </div>
     </form>
 </div>

diff --git a/src/main/resources/templates/users/new.html b/src/main/resources/templates/users/new.html
@@ -1,12 +1,13 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<html lang="en">
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
     <head>
         <meta charset="UTF-8">
         <title>Signup</title>
     </head>
     <body>
         <form action="#" th:action="@{/users}" th:object="${user}" method="post">
+            <p id="usernameError" class="alert alert-error" th:text="${param.usernameError}"></p>
+            <p id="passwordError" class="alert alert-error" th:text="${param.passwordError}"></p>
             <p>Username: <input type="text" th:field="*{username}" /></p>
             <p>Password: <input type="password" th:field="*{password}" /></p>
             <p><input type="submit" value="Submit" id="submit"/> <input type="reset" value="Reset" /></p>

diff --git a/src/test/java/SignUpTest.java b/src/test/java/SignUpTest.java
@@ -7,7 +7,10 @@
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
 import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -38,6 +41,41 @@ public void successfulSignUpRedirectsToSignIn() {
         driver.findElement(By.id("password")).sendKeys("password");
         driver.findElement(By.id("submit")).click();
         String title = driver.getTitle();
-        Assert.assertEquals("Please sign in", title);
+        Assert.assertEquals("Please log in", title);
+    }
+
+
+    @Test
+    public void signUpButtonLinksToSignUpPage() {
+        driver.get("http://localhost:8080/login");
+        driver.findElement(By.id("sign-up-btn")).click();
+        String title = driver.getTitle();
+        Assert.assertEquals("Signup", title);
+    }
+
+    @Test
+    public void testBlankUsernameReturnsError() {
+        driver.get("http://localhost:8080/users/new");
+        driver.findElement(By.id("username")).sendKeys(" ");
+        driver.findElement(By.id("password")).sendKeys("password");
+        driver.findElement(By.id("submit")).click();
+        // Explicitly wait for the error message to be visible
+        WebDriverWait wait = new WebDriverWait(driver, 10);
+        WebElement usernameError = wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("usernameError")));
+        String errorString = usernameError.getText();
+        Assert.assertEquals("Please enter a username", errorString);
+    }
+
+    @Test
+    public void testBlankPasswordReturnsError() {
+        driver.get("http://localhost:8080/users/new");
+        driver.findElement(By.id("username")).sendKeys("username_1");
+        driver.findElement(By.id("password")).sendKeys(" ");
+        driver.findElement(By.id("submit")).click();
+        // Explicitly wait for the error message to be visible
+        WebDriverWait wait = new WebDriverWait(driver, 10);
+        WebElement passwordError = wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("passwordError")));
+        String errorString = passwordError.getText();
+        Assert.assertEquals("Please enter a password", errorString);
     }
 }
diff --git a/src/test/java/com/makersacademy/acebook/model/PostTest.java b/src/test/java/com/makersacademy/acebook/model/PostTest.java
@@ -18,9 +18,9 @@ public void postHasContent() {
 		assertThat(post.getContent(), containsString("hello"));
 	}
 
-//	@Test
-//	public void postHasContent() {
-//		assertThat(post.getContent(), containsString("hello"));
-//	}
-//
+	@Test
+	public void postHasU() {
+		assertThat(post.getContent(), containsString("hello"));
+	}
+
 }