Merge remote-tracking branch 'origin/master'

src/test/java/fr/xephi/authme/process/email/AsyncAddEmailTest.java

@@ -179,7 +179,7 @@ public class AsyncAddEmailTest {
         asyncAddEmail.addEmail(player, "test@mail.com");
 
         // then
-        verify(service).send(player, MessageKey.REGISTER_EMAIL_MESSAGE);
+        verify(service).send(player, MessageKey.REGISTER_EMAIL_NO_REPEAT_MESSAGE);
         verify(playerCache, never()).updatePlayer(any(PlayerAuth.class));
     }
 

src/test/java/fr/xephi/authme/process/email/AsyncChangeEmailTest.java

@@ -210,7 +210,7 @@ public class AsyncChangeEmailTest {
         // then
         verify(dataSource, never()).updateEmail(any(PlayerAuth.class));
         verify(playerCache, never()).updatePlayer(any(PlayerAuth.class));
-        verify(service).send(player, MessageKey.REGISTER_MESSAGE);
+        verify(service).send(player, MessageKey.REGISTER_NO_REPEAT_MESSAGE);
     }
 
     private static PlayerAuth authWithMail(String email) {

src/test/java/fr/xephi/authme/task/LimboPlayerTaskManagerTest.java

@@ -120,7 +120,7 @@ public class LimboPlayerTaskManagerTest {
 
         String name = "bobby";
         given(limboCache.getPlayerData(name)).willReturn(limboPlayer);
-        given(messages.retrieve(MessageKey.REGISTER_EMAIL_MESSAGE))
+        given(messages.retrieve(MessageKey.REGISTER_EMAIL_NO_REPEAT_MESSAGE))
             .willReturn(new String[]{"Please register", "Use /register"});
 
         given(settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)).willReturn(8);
@@ -131,7 +131,7 @@ public class LimboPlayerTaskManagerTest {
 
         // then
         verify(limboPlayer).setMessageTask(any(MessageTask.class));
-        verify(messages).retrieve(MessageKey.REGISTER_EMAIL_MESSAGE);
+        verify(messages).retrieve(MessageKey.REGISTER_EMAIL_NO_REPEAT_MESSAGE);
         verify(existingMessageTask).cancel();
     }