From 39c7c20aa234235e4285e013e59164ab093a1de1 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Fri, 30 Aug 2019 07:18:04 +0200 Subject: [PATCH] upd: correct url in email when ping fails Change-Id: I4c5c3006b48f0dfd645437284f2c1724a2d27f03 --- src/club/wpia/gigi/ping/PingerDaemon.java | 2 +- tests/club/wpia/gigi/ping/TestTiming.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/club/wpia/gigi/ping/PingerDaemon.java b/src/club/wpia/gigi/ping/PingerDaemon.java index 895e8c83..dee4e90c 100644 --- a/src/club/wpia/gigi/ping/PingerDaemon.java +++ b/src/club/wpia/gigi/ping/PingerDaemon.java @@ -201,7 +201,7 @@ public class PingerDaemon extends Thread { HashMap vars = new HashMap<>(); vars.put("valid", target.isVerified()); vars.put("domain", target.getSuffix()); - vars.put("domainLink", "https://" + ServerConstants.getHostNamePortSecure(Host.WWW) + "/" + EditDomain.PATH + target.getId()); + vars.put("domainLink", "https://" + ServerConstants.getHostNamePortSecure(Host.WWW) + EditDomain.PATH + target.getId()); vars.put("certs", new ArrayIterable(cs) { @Override diff --git a/tests/club/wpia/gigi/ping/TestTiming.java b/tests/club/wpia/gigi/ping/TestTiming.java index f2b6fe10..2c36b03b 100644 --- a/tests/club/wpia/gigi/ping/TestTiming.java +++ b/tests/club/wpia/gigi/ping/TestTiming.java @@ -23,10 +23,13 @@ import club.wpia.gigi.dbObjects.Domain; import club.wpia.gigi.dbObjects.DomainPingConfiguration; import club.wpia.gigi.dbObjects.DomainPingExecution; import club.wpia.gigi.dbObjects.DomainPingType; +import club.wpia.gigi.pages.account.domain.EditDomain; import club.wpia.gigi.ping.DomainPinger.PingState; import club.wpia.gigi.testUtils.PingTest; import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; import club.wpia.gigi.util.RandomToken; +import club.wpia.gigi.util.ServerConstants; +import club.wpia.gigi.util.ServerConstants.Host; import club.wpia.gigi.util.SimpleSigner; public class TestTiming extends PingTest { @@ -109,6 +112,7 @@ public class TestTiming extends PingTest { pd.executeNeededPings(new Date(System.currentTimeMillis() + 15 * 24 * 60 * 60L * 1000)); // The user receives another warning mail. mail = getMailReceiver().receive(u.getEmail()); + assertThat(mail.getMessage(), CoreMatchers.containsString("https://" + ServerConstants.getHostNamePortSecure(Host.WWW) + EditDomain.PATH + d.getId())); assertThat(mail.getMessage(), CoreMatchers.containsString(d.getSuffix())); assertThat(mail.getMessage(), CoreMatchers.containsString(c.getSerial())); // And when the revocation is carried out -- 2.39.2