From 520e76342042946c9969ccf08b423bdc043539ce Mon Sep 17 00:00:00 2001
From: Eric Stout <ericwstout@gmail.com>
Date: Sun, 1 Sep 2019 21:01:31 -0500
Subject: [PATCH 1/5] Open paypal link in new window, close #310

Signed-off-by: Eric Stout <ericwstout@gmail.com>
---
 src/components/common/Footer.tsx                | 7 ++++++-
 src/components/common/__tests__/Footer.test.tsx | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/common/Footer.tsx b/src/components/common/Footer.tsx
index 4235f1e..33304eb 100644
--- a/src/components/common/Footer.tsx
+++ b/src/components/common/Footer.tsx
@@ -20,7 +20,12 @@ const Footer = (props: any) => {
       <div>
         <i className="fab fa-paypal" />
         <strong>
-          <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=3J2L3Z4DHW9UY">
+          <a
+            id="paypalDonation"
+            href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=3J2L3Z4DHW9UY"
+            target="_blank"
+            rel="noopenner noreferrer"
+          >
             &nbsp;
             {t("Donate")}
           </a>
diff --git a/src/components/common/__tests__/Footer.test.tsx b/src/components/common/__tests__/Footer.test.tsx
index ac69aef..2175470 100644
--- a/src/components/common/__tests__/Footer.test.tsx
+++ b/src/components/common/__tests__/Footer.test.tsx
@@ -13,5 +13,9 @@ import { shallow } from "enzyme";
 import Footer from "../Footer";
 
 it("renders without crashing", () => {
-  shallow(<Footer />).dive();
+  const wrapper = shallow(<Footer />)
+    .dive()
+    .dive()
+    .dive();
+  expect(wrapper.find("#paypalDonation").prop("target")).toBe("_blank");
 });

From 3485679a4eab20e7e9ebf5855c62d83c340607af Mon Sep 17 00:00:00 2001
From: Eric Stout <ericwstout@gmail.com>
Date: Wed, 4 Sep 2019 21:47:54 -0500
Subject: [PATCH 2/5] Fix typo in paypal link, update tests

Signed-off-by: Eric Stout <ericwstout@gmail.com>
---
 src/components/common/Footer.tsx                | 2 +-
 src/components/common/FooterUpdateStatus.tsx    | 4 ++--
 src/components/common/__tests__/Footer.test.tsx | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/common/Footer.tsx b/src/components/common/Footer.tsx
index 33304eb..4309ea0 100644
--- a/src/components/common/Footer.tsx
+++ b/src/components/common/Footer.tsx
@@ -24,7 +24,7 @@ const Footer = (props: any) => {
             id="paypalDonation"
             href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=3J2L3Z4DHW9UY"
             target="_blank"
-            rel="noopenner noreferrer"
+            rel="noopener noreferrer"
           >
             &nbsp;
             {t("Donate")}
diff --git a/src/components/common/FooterUpdateStatus.tsx b/src/components/common/FooterUpdateStatus.tsx
index 4a19ebf..f01c141 100644
--- a/src/components/common/FooterUpdateStatus.tsx
+++ b/src/components/common/FooterUpdateStatus.tsx
@@ -9,7 +9,7 @@
  * Please see LICENSE file for your rights under this license. */
 
 import React from "react";
-import { WithTranslation, withTranslation } from "react-i18next";
+import { WithTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 
 const FooterUpdateStatus = ({
@@ -27,4 +27,4 @@ const FooterUpdateStatus = ({
   );
 };
 
-export default withTranslation("footer")(FooterUpdateStatus);
+export default FooterUpdateStatus;
diff --git a/src/components/common/__tests__/Footer.test.tsx b/src/components/common/__tests__/Footer.test.tsx
index 2175470..1df44f0 100644
--- a/src/components/common/__tests__/Footer.test.tsx
+++ b/src/components/common/__tests__/Footer.test.tsx
@@ -13,9 +13,5 @@ import { shallow } from "enzyme";
 import Footer from "../Footer";
 
 it("renders without crashing", () => {
-  const wrapper = shallow(<Footer />)
-    .dive()
-    .dive()
-    .dive();
-  expect(wrapper.find("#paypalDonation").prop("target")).toBe("_blank");
+  shallow(<Footer />);
 });

From 96febff5ae863a4c6015050993cea831fc90e2b0 Mon Sep 17 00:00:00 2001
From: Eric Stout <ericwstout@gmail.com>
Date: Wed, 4 Sep 2019 22:16:20 -0500
Subject: [PATCH 3/5] Update tests and create new FooterDonateLink component

Signed-off-by: Eric Stout <ericwstout@gmail.com>
---
 src/components/common/Footer.tsx              | 11 ++-----
 src/components/common/FooterDonateLink.tsx    | 28 ++++++++++++++++++
 .../__tests__/FooterDonateLink.test.tsx       | 29 +++++++++++++++++++
 .../__tests__/FooterUpdateStatus.test.tsx     |  8 ++---
 4 files changed, 63 insertions(+), 13 deletions(-)
 create mode 100644 src/components/common/FooterDonateLink.tsx
 create mode 100644 src/components/common/__tests__/FooterDonateLink.test.tsx

diff --git a/src/components/common/Footer.tsx b/src/components/common/Footer.tsx
index 4309ea0..d7a7870 100644
--- a/src/components/common/Footer.tsx
+++ b/src/components/common/Footer.tsx
@@ -11,6 +11,7 @@
 import React, { Suspense } from "react";
 import { withTranslation } from "react-i18next";
 import FooterUpdateStatus from "./FooterUpdateStatus";
+import FooterDonateLink from "./FooterDonateLink";
 
 const Footer = (props: any) => {
   const { t } = props;
@@ -20,15 +21,7 @@ const Footer = (props: any) => {
       <div>
         <i className="fab fa-paypal" />
         <strong>
-          <a
-            id="paypalDonation"
-            href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=3J2L3Z4DHW9UY"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            &nbsp;
-            {t("Donate")}
-          </a>
+          <FooterDonateLink t={t} />
         </strong>{" "}
         {t("if you found this useful")}
       </div>
diff --git a/src/components/common/FooterDonateLink.tsx b/src/components/common/FooterDonateLink.tsx
new file mode 100644
index 0000000..d5d6ada
--- /dev/null
+++ b/src/components/common/FooterDonateLink.tsx
@@ -0,0 +1,28 @@
+/* Pi-hole: A black hole for Internet advertisements
+ * (c) 2019 Pi-hole, LLC (https://pi-hole.net)
+ * Network-wide ad blocking via your own hardware.
+ *
+ * Web Interface
+ * Footer Donate Link component
+ *
+ * This file is copyright under the latest version of the EUPL.
+ * Please see LICENSE file for your rights under this license. */
+
+import React from "react";
+
+const FooterDonateLink = (props: any) => {
+  const { t } = props;
+  return (
+    <a
+      id="paypalDonation"
+      href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=3J2L3Z4DHW9UY"
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      &nbsp;
+      {t("Donate")}
+    </a>
+  );
+};
+
+export default FooterDonateLink;
diff --git a/src/components/common/__tests__/FooterDonateLink.test.tsx b/src/components/common/__tests__/FooterDonateLink.test.tsx
new file mode 100644
index 0000000..87d78eb
--- /dev/null
+++ b/src/components/common/__tests__/FooterDonateLink.test.tsx
@@ -0,0 +1,29 @@
+/* Pi-hole: A black hole for Internet advertisements
+ * (c) 2019 Pi-hole, LLC (https://pi-hole.net)
+ * Network-wide ad blocking via your own hardware.
+ *
+ * Web Interface
+ * Footer component test
+ *
+ * This file is copyright under the latest version of the EUPL.
+ * Please see LICENSE file for your rights under this license. */
+
+import React from "react";
+import { shallow } from "enzyme";
+import FooterDonateLink from "../FooterDonateLink";
+
+it("renders without crashing", () => {
+  shallow(<FooterDonateLink t={(text: string) => text} />);
+});
+
+it("opens a new tab", () => {
+  expect(
+    shallow(<FooterDonateLink t={(text: string) => text} />).prop("target")
+  ).toBe("_blank");
+});
+
+it("opens new tab securely", () => {
+  expect(
+    shallow(<FooterDonateLink t={(text: string) => text} />).prop("rel")
+  ).toBe("noopener noreferrer");
+});
diff --git a/src/components/common/__tests__/FooterUpdateStatus.test.tsx b/src/components/common/__tests__/FooterUpdateStatus.test.tsx
index aac5764..d3eb2fc 100644
--- a/src/components/common/__tests__/FooterUpdateStatus.test.tsx
+++ b/src/components/common/__tests__/FooterUpdateStatus.test.tsx
@@ -14,15 +14,15 @@ import * as React from "react";
 import { Link } from "react-router-dom";
 
 it("renders as null if no update is available", () => {
-  const wrapper = shallow(
-    <FooterUpdateStatus updateAvailable={false} />
-  ).dive();
+  const wrapper = shallow(<FooterUpdateStatus updateAvailable={false} />);
 
   expect(wrapper).toBeEmptyRender();
 });
 
 it("renders a link to the versions page if there is an update", () => {
-  const wrapper = shallow(<FooterUpdateStatus updateAvailable={true} />).dive();
+  const wrapper = shallow(
+    <FooterUpdateStatus t={(text: string) => text} updateAvailable={true} />
+  );
 
   expect(wrapper.find(Link).props().to).toEqual("/settings/versions");
 });

From 4b7bc43f79f66f42db8e5210060957d8af89b79c Mon Sep 17 00:00:00 2001
From: Eric Stout <ericwstout@gmail.com>
Date: Sun, 8 Sep 2019 20:30:22 -0500
Subject: [PATCH 4/5] Address feedback from #384

Signed-off-by: Eric Stout <ericwstout@gmail.com>
---
 src/components/common/__tests__/Footer.test.tsx           | 2 +-
 src/components/common/__tests__/FooterDonateLink.test.tsx | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/components/common/__tests__/Footer.test.tsx b/src/components/common/__tests__/Footer.test.tsx
index 1df44f0..ac69aef 100644
--- a/src/components/common/__tests__/Footer.test.tsx
+++ b/src/components/common/__tests__/Footer.test.tsx
@@ -13,5 +13,5 @@ import { shallow } from "enzyme";
 import Footer from "../Footer";
 
 it("renders without crashing", () => {
-  shallow(<Footer />);
+  shallow(<Footer />).dive();
 });
diff --git a/src/components/common/__tests__/FooterDonateLink.test.tsx b/src/components/common/__tests__/FooterDonateLink.test.tsx
index 87d78eb..26bd6ec 100644
--- a/src/components/common/__tests__/FooterDonateLink.test.tsx
+++ b/src/components/common/__tests__/FooterDonateLink.test.tsx
@@ -12,10 +12,6 @@ import React from "react";
 import { shallow } from "enzyme";
 import FooterDonateLink from "../FooterDonateLink";
 
-it("renders without crashing", () => {
-  shallow(<FooterDonateLink t={(text: string) => text} />);
-});
-
 it("opens a new tab", () => {
   expect(
     shallow(<FooterDonateLink t={(text: string) => text} />).prop("target")
@@ -25,5 +21,5 @@ it("opens a new tab", () => {
 it("opens new tab securely", () => {
   expect(
     shallow(<FooterDonateLink t={(text: string) => text} />).prop("rel")
-  ).toBe("noopener noreferrer");
+  ).toEqual("noopener noreferrer");
 });

From fa2898a544a7cce5427aa6c857c5b17b81269710 Mon Sep 17 00:00:00 2001
From: Eric Stout <ericwstout@gmail.com>
Date: Wed, 11 Sep 2019 22:10:59 -0500
Subject: [PATCH 5/5] Fix remaining toBe

Signed-off-by: Eric Stout <ericwstout@gmail.com>
---
 src/components/common/__tests__/FooterDonateLink.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/__tests__/FooterDonateLink.test.tsx b/src/components/common/__tests__/FooterDonateLink.test.tsx
index 26bd6ec..c5b814d 100644
--- a/src/components/common/__tests__/FooterDonateLink.test.tsx
+++ b/src/components/common/__tests__/FooterDonateLink.test.tsx
@@ -15,7 +15,7 @@ import FooterDonateLink from "../FooterDonateLink";
 it("opens a new tab", () => {
   expect(
     shallow(<FooterDonateLink t={(text: string) => text} />).prop("target")
-  ).toBe("_blank");
+  ).toEqual("_blank");
 });
 
 it("opens new tab securely", () => {