Browse Source

Test fixed

pull/176/head
Volodymyr Babak 9 years ago
parent
commit
f69c31f077
  1. 2
      application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
  2. 4
      application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java

2
application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java

@ -200,7 +200,7 @@ public abstract class AbstractControllerTest {
User savedUser = doPost("/api/user", user, User.class);
logout();
doGet("/api/noauth/activate?activateToken={activateToken}", TestMailService.currentActivateToken)
.andExpect(status().isPermanentRedirect())
.andExpect(status().isSeeOther())
.andExpect(header().string(HttpHeaders.LOCATION, "/login/createPassword?activateToken=" + TestMailService.currentActivateToken));
JsonNode tokenInfo = readResponse(doPost("/api/noauth/activate", "activateToken", TestMailService.currentActivateToken, "password", password).andExpect(status().isOk()), JsonNode.class);
validateAndSetJwtToken(tokenInfo, user.getEmail());

4
application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java

@ -70,7 +70,7 @@ public class UserControllerTest extends AbstractControllerTest {
logout();
doGet("/api/noauth/activate?activateToken={activateToken}", TestMailService.currentActivateToken)
.andExpect(status().isPermanentRedirect())
.andExpect(status().isSeeOther())
.andExpect(header().string(HttpHeaders.LOCATION, "/login/createPassword?activateToken=" + TestMailService.currentActivateToken));
JsonNode tokenInfo = readResponse(doPost("/api/noauth/activate", "activateToken", TestMailService.currentActivateToken, "password", "testPassword").andExpect(status().isOk()), JsonNode.class);
@ -120,7 +120,7 @@ public class UserControllerTest extends AbstractControllerTest {
doPost("/api/noauth/resetPasswordByEmail", "email", email)
.andExpect(status().isOk());
doGet("/api/noauth/resetPassword?resetToken={resetToken}", TestMailService.currentResetPasswordToken)
.andExpect(status().isPermanentRedirect())
.andExpect(status().isSeeOther())
.andExpect(header().string(HttpHeaders.LOCATION, "/login/resetPassword?resetToken=" + TestMailService.currentResetPasswordToken));
JsonNode tokenInfo = readResponse(doPost("/api/noauth/resetPassword", "resetToken", TestMailService.currentResetPasswordToken, "password", "testPassword2").andExpect(status().isOk()), JsonNode.class);

Loading…
Cancel
Save