Merge pull request #38 from nagisa77/codex/define-captchaservice-bean

Fix captcha dependency in tests

src/test/java/com/openisle/controller/AuthControllerTest.java

@@ -4,6 +4,7 @@ import com.openisle.model.User;
 import com.openisle.service.EmailSender;
 import com.openisle.service.JwtService;
 import com.openisle.service.UserService;
+import com.openisle.service.CaptchaService;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,8 @@ class AuthControllerTest {
     private JwtService jwtService;
     @MockBean
     private EmailSender emailService;
+    @MockBean
+    private CaptchaService captchaService;
 
     @Test
     void registerSendsEmail() throws Exception {

src/test/java/com/openisle/controller/CommentControllerTest.java

@@ -4,6 +4,7 @@ import com.openisle.model.Comment;
 import com.openisle.model.Post;
 import com.openisle.model.User;
 import com.openisle.service.CommentService;
+import com.openisle.service.CaptchaService;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,8 @@ class CommentControllerTest {
 
     @MockBean
     private CommentService commentService;
+    @MockBean
+    private CaptchaService captchaService;
 
     private Comment createComment(Long id, String content, String authorName) {
         User user = new User();

src/test/java/com/openisle/controller/PostControllerTest.java

@@ -6,6 +6,7 @@ import com.openisle.model.Category;
 import com.openisle.service.PostService;
 import com.openisle.service.CommentService;
 import com.openisle.service.ReactionService;
+import com.openisle.service.CaptchaService;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,8 @@ class PostControllerTest {
     private CommentService commentService;
     @MockBean
     private ReactionService reactionService;
+    @MockBean
+    private CaptchaService captchaService;
 
     @Test
     void createAndGetPost() throws Exception {

src/test/java/com/openisle/integration/ComplexFlowIntegrationTest.java

@@ -35,8 +35,10 @@ class ComplexFlowIntegrationTest {
         rest.postForEntity("/api/auth/register", new HttpEntity<>(
                 Map.of("username", username, "email", email, "password", "pass123"), h), Map.class);
         User u = users.findByUsername(username).orElseThrow();
-        rest.postForEntity("/api/auth/verify", new HttpEntity<>(
+        if (u.getVerificationCode() != null) {
-                Map.of("username", username, "code", u.getVerificationCode()), h), Map.class);
+            rest.postForEntity("/api/auth/verify", new HttpEntity<>(
+                    Map.of("username", username, "code", u.getVerificationCode()), h), Map.class);
+        }
         ResponseEntity<Map> resp = rest.postForEntity("/api/auth/login", new HttpEntity<>(
                 Map.of("username", username, "password", "pass123"), h), Map.class);
         return (String) resp.getBody().get("token");

src/test/java/com/openisle/integration/SearchIntegrationTest.java

@@ -31,8 +31,10 @@ class SearchIntegrationTest {
         rest.postForEntity("/api/auth/register", new HttpEntity<>(
                 Map.of("username", username, "email", email, "password", "pass123"), h), Map.class);
         User u = users.findByUsername(username).orElseThrow();
-        rest.postForEntity("/api/auth/verify", new HttpEntity<>(
+        if (u.getVerificationCode() != null) {
-                Map.of("username", username, "code", u.getVerificationCode()), h), Map.class);
+            rest.postForEntity("/api/auth/verify", new HttpEntity<>(
+                    Map.of("username", username, "code", u.getVerificationCode()), h), Map.class);
+        }
         ResponseEntity<Map> resp = rest.postForEntity("/api/auth/login", new HttpEntity<>(
                 Map.of("username", username, "password", "pass123"), h), Map.class);
         return (String) resp.getBody().get("token");