From 3f0d35ecb738d9e451b2b9a8fe9f887694464653 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Mon, 1 May 2017 16:24:16 +0100 Subject: HTTPS links --- gentoobrowse-api/service/notifications/xslt/base.xslt | 17 ++++++++--------- gentoobrowse-api/service/notifications/xslt/news.xslt | 8 ++++---- gentoobrowse-api/service/notifications/xslt/signup.xslt | 4 ++-- gentoobrowse-api/unittests/testNotifications.cpp | 8 +++++--- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/gentoobrowse-api/service/notifications/xslt/base.xslt b/gentoobrowse-api/service/notifications/xslt/base.xslt index cbd704d..ee21294 100644 --- a/gentoobrowse-api/service/notifications/xslt/base.xslt +++ b/gentoobrowse-api/service/notifications/xslt/base.xslt @@ -1,6 +1,5 @@ - + @@ -8,9 +7,9 @@ - - - + + + <xsl:call-template name="title" /> @@ -18,7 +17,7 @@ @@ -68,9 +67,9 @@ - - - + + + diff --git a/gentoobrowse-api/service/notifications/xslt/news.xslt b/gentoobrowse-api/service/notifications/xslt/news.xslt index 04ff36e..a5d1c04 100644 --- a/gentoobrowse-api/service/notifications/xslt/news.xslt +++ b/gentoobrowse-api/service/notifications/xslt/news.xslt @@ -1,5 +1,5 @@ - + @@ -16,7 +16,7 @@
  • - http://gentoobrowse.randomdan.homeip.net/packages/ + https://gentoobrowse.randomdan.homeip.net/packages/   @@ -33,12 +33,12 @@

    - http://gentoobrowse.randomdan.homeip.net/packages/ + https://gentoobrowse.randomdan.homeip.net/packages/ / - http://gentoobrowse.randomdan.homeip.net/packages// + https://gentoobrowse.randomdan.homeip.net/packages// : diff --git a/gentoobrowse-api/service/notifications/xslt/signup.xslt b/gentoobrowse-api/service/notifications/xslt/signup.xslt index e579835..d6c94b5 100644 --- a/gentoobrowse-api/service/notifications/xslt/signup.xslt +++ b/gentoobrowse-api/service/notifications/xslt/signup.xslt @@ -10,10 +10,10 @@

    Click - http://gentoobrowse.randomdan.homeip.net/user/verify/ + https://gentoobrowse.randomdan.homeip.net/user/verify/ - http://gentoobrowse.randomdan.homeip.net/user/verify/ + https://gentoobrowse.randomdan.homeip.net/user/verify/ to confirm your account.

    diff --git a/gentoobrowse-api/unittests/testNotifications.cpp b/gentoobrowse-api/unittests/testNotifications.cpp index 8759e85..357a29e 100644 --- a/gentoobrowse-api/unittests/testNotifications.cpp +++ b/gentoobrowse-api/unittests/testNotifications.cpp @@ -40,6 +40,8 @@ commonAssert(Gentoo::EmailPtr e) BOOST_REQUIRE(!isHtml(e->body[0]->payload)); BOOST_REQUIRE_EQUAL(e->body[1]->mimetype, "text/html"); BOOST_REQUIRE(isHtml(e->body[1]->payload)); + BOOST_REQUIRE_EQUAL(e->body[0]->payload.find("http://gentoobrowse.randomdan.homeip.net"), std::string::npos); + BOOST_REQUIRE_EQUAL(e->body[1]->payload.find("http://gentoobrowse.randomdan.homeip.net"), std::string::npos); } BOOST_AUTO_TEST_CASE( testSend ) @@ -64,7 +66,7 @@ BOOST_AUTO_TEST_CASE( testSignup ) save("signup", e); for (auto p : e->body) { BOOST_REQUIRE(p->payload.find("Welcome to Gentoo Browse") != std::string::npos); - BOOST_REQUIRE(p->payload.find("http://gentoobrowse.randomdan.homeip.net/user/verify/some-guid") != std::string::npos); + BOOST_REQUIRE(p->payload.find("https://gentoobrowse.randomdan.homeip.net/user/verify/some-guid") != std::string::npos); BOOST_REQUIRE(p->payload.find("confirmation page: some-guid") != std::string::npos); } } @@ -99,8 +101,8 @@ BOOST_AUTO_TEST_CASE( testNews ) save("news", e); for (auto p : e->body) { BOOST_REQUIRE(p->payload.find("Latest news") != std::string::npos); - BOOST_REQUIRE(p->payload.find("http://gentoobrowse.randomdan.homeip.net/packages/app-test") != std::string::npos); - BOOST_REQUIRE(p->payload.find("http://gentoobrowse.randomdan.homeip.net/packages/app-test/app") != std::string::npos); + BOOST_REQUIRE(p->payload.find("https://gentoobrowse.randomdan.homeip.net/packages/app-test") != std::string::npos); + BOOST_REQUIRE(p->payload.find("https://gentoobrowse.randomdan.homeip.net/packages/app-test/app") != std::string::npos); BOOST_REQUIRE(p->payload.find("no-show") == std::string::npos); } } -- cgit v1.2.3