}
}
}
- sql = sql.replaceAll("--[^\n]*\n", "\n");
+ sql = sql.replaceAll("(^|\n)--[^\n]*\n", "\n");
sql = sql.replaceAll("#[^\n]*\n", "\n");
String[] stmts = sql.split(";");
Pattern p = Pattern.compile("\\s*DROP TABLE IF EXISTS \"([^\"]+)\"");
HashMap<String, Object> 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<Certificate>(cs) {
@Override
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 {
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