travis test 3

Author: merikbest

src/main/java/com/gmail/merikbest2015/ecommerce/controller/RegistrationController.java

@@ -1,10 +1,8 @@
 package com.gmail.merikbest2015.ecommerce.controller;
 
+import com.gmail.merikbest2015.ecommerce.dto.CaptchaResponseDto;
 import com.gmail.merikbest2015.ecommerce.dto.RegistrationRequestDto;
-import com.gmail.merikbest2015.ecommerce.exception.ApiRequestException;
-import com.gmail.merikbest2015.ecommerce.exception.EmailException;
-import com.gmail.merikbest2015.ecommerce.exception.InputFieldException;
-import com.gmail.merikbest2015.ecommerce.exception.PasswordException;
+import com.gmail.merikbest2015.ecommerce.exception.*;
 import com.gmail.merikbest2015.ecommerce.mapper.UserMapper;
 import com.gmail.merikbest2015.ecommerce.utils.ControllerUtils;
 import lombok.RequiredArgsConstructor;
@@ -25,7 +23,7 @@ public class RegistrationController {
 
     @PostMapping
     public ResponseEntity<String> registration(@Valid @RequestBody RegistrationRequestDto user, BindingResult bindingResult) {
-        controllerUtils.captchaValidation(user.getCaptcha());
+        CaptchaResponseDto captchaResponseDto = controllerUtils.captchaValidation(user.getCaptcha());
 
         if (controllerUtils.isPasswordDifferent(user.getPassword(), user.getPassword2())) {
             throw new PasswordException("Passwords do not match.");
@@ -36,6 +34,9 @@ public ResponseEntity<String> registration(@Valid @RequestBody RegistrationReque
         if (!userMapper.registerUser(user)) {
             throw new EmailException("Email is already used.");
         }
+        if (!captchaResponseDto.isSuccess()) {
+            throw new CaptchaException("Fill captcha.");
+        }
         return ResponseEntity.ok("User successfully registered.");
     }
 

src/test/java/com/gmail/merikbest2015/ecommerce/controller/RegistrationControllerTest.java

@@ -87,6 +87,17 @@ public void registration_ShouldUserEmailIsExist() throws Exception {
                 .andExpect(jsonPath("$.emailError").value("Email is already used."));
     }
 
+    @Test
+    public void registration_ShouldCaptchaNotFilled() throws Exception {
+        registrationRequestDto.setCaptcha(null);
+
+        mockMvc.perform(post(URL_REGISTRATION_BASIC)
+                .content(mapper.writeValueAsString(registrationRequestDto))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.captchaError").value("Fill captcha."));
+    }
+
     @Test
     public void registration_ShouldInputFieldsAreEmpty() throws Exception {
         mockMvc.perform(post(URL_REGISTRATION_BASIC)

src/test/java/com/gmail/merikbest2015/ecommerce/service/Impl/UserServiceImlTest.java

@@ -147,6 +147,8 @@ public void loadUserByUsername() {
         assertTrue(user.isActive());
     }
 
+    
+
     @Test
     public void registerUser() {
         User user = new User();