add: implement password change log

[gigi.git] / tests / club / wpia / gigi / pages / admin / TestSEAdminNotificationMail.java

diff --git a/tests/club/wpia/gigi/pages/admin/TestSEAdminNotificationMail.java b/tests/club/wpia/gigi/pages/admin/TestSEAdminNotificationMail.java
index 97ac6a0065a05d6c8800f7c0b3777b666bb3d0c0..a84e0e2f7c0cbaddecf5c383eab4a8e04e9c86b7 100644 (file)
--- a/tests/club/wpia/gigi/pages/admin/TestSEAdminNotificationMail.java
+++ b/tests/club/wpia/gigi/pages/admin/TestSEAdminNotificationMail.java
@@ -12,6 +12,7 @@ import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Locale;
 
+import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 
 import club.wpia.gigi.GigiApiException;
@@ -20,6 +21,7 @@ import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.localisation.Language;
 import club.wpia.gigi.pages.account.MyDetails;
 import club.wpia.gigi.pages.admin.support.SupportUserDetailsPage;
+import club.wpia.gigi.testUtils.ArrayContains;
 import club.wpia.gigi.testUtils.IOUtils;
 import club.wpia.gigi.testUtils.SEClientTest;
 import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail;
@@ -59,6 +61,10 @@ public class TestSEAdminNotificationMail extends SEClientTest {
         getMailReceiver().receive(targetEmail);
         TestMail tm = getMailReceiver().receive(ServerConstants.getSupportMailAddress());
         assertThat(tm.getMessage(), containsString("A password reset was triggered and an email was sent to user."));
+
+        User test = User.getById(targetID);
+        String[] result = test.getAdminLog();
+        assertThat(result, ArrayContains.contains(CoreMatchers.equalTo("SE triggered password reset (a20140808.8)")));
     }
 
     @Test
@@ -158,7 +164,7 @@ public class TestSEAdminNotificationMail extends SEClientTest {
 
         // supporter removes supporter flag
         URLConnection uc = post(SupportUserDetailsPage.PATH + u.getId() + "/", "removeGroup&groupToModify=" + URLEncoder.encode(Group.SUPPORTER.getDBName(), "UTF-8"));
-        assertEquals("https://" + ServerConstants.getHostNamePortSecure(Host.WWW) + MyDetails.PATH, uc.getHeaderField("Location"));
+        assertEquals("https://" + ServerConstants.getHostNamePortSecure(Host.SECURE) + MyDetails.PATH, uc.getHeaderField("Location"));
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
         Group.SUPPORTER.getName().output(pw, Language.getInstance(Locale.ENGLISH), new HashMap<String, Object>());