test: more tests

favonia · Nov 6, 2023 · b1c39c1 · b1c39c1
1 parent e85d352
commit b1c39c1
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 17 deletions.
diff --git a/internal/monitor/healthchecks.go b/internal/monitor/healthchecks.go
@@ -149,7 +149,7 @@ func (h *Healthchecks) ping(ctx context.Context, ppfmt pp.PP, endpoint string, m
 		return false
 	}
 
-	ppfmt.Infof(pp.EmojiNotification, "Successfully pinged the %s endpoint of Healthchecks", endpointDescription)
+	ppfmt.Infof(pp.EmojiPing, "Pinged the %s endpoint of Healthchecks", endpointDescription)
 	return true
 }
 

diff --git a/internal/monitor/healthchecks_test.go b/internal/monitor/healthchecks_test.go
@@ -114,7 +114,7 @@ func TestHealthchecksEndPoints(t *testing.T) {
 			func(m *mocks.MockPP) {
 				gomock.InOrder(
 					m.EXPECT().Warningf(pp.EmojiUserWarning, "The Healthchecks URL (redacted) uses HTTP; please consider using HTTPS"),
-					m.EXPECT().Infof(pp.EmojiNotification, "Successfully pinged the %s endpoint of Healthchecks", `default (root)`), //nolint:lll
+					m.EXPECT().Infof(pp.EmojiPing, "Pinged the %s endpoint of Healthchecks", `default (root)`),
 				)
 			},
 		},
@@ -159,7 +159,7 @@ func TestHealthchecksEndPoints(t *testing.T) {
 			func(m *mocks.MockPP) {
 				gomock.InOrder(
 					m.EXPECT().Warningf(pp.EmojiUserWarning, "The Healthchecks URL (redacted) uses HTTP; please consider using HTTPS"),
-					m.EXPECT().Infof(pp.EmojiNotification, "Successfully pinged the %s endpoint of Healthchecks", `"/start"`), //nolint:lll
+					m.EXPECT().Infof(pp.EmojiPing, "Pinged the %s endpoint of Healthchecks", `"/start"`),
 				)
 			},
 		},
@@ -174,7 +174,7 @@ func TestHealthchecksEndPoints(t *testing.T) {
 			func(m *mocks.MockPP) {
 				gomock.InOrder(
 					m.EXPECT().Warningf(pp.EmojiUserWarning, "The Healthchecks URL (redacted) uses HTTP; please consider using HTTPS"),
-					m.EXPECT().Infof(pp.EmojiNotification, "Successfully pinged the %s endpoint of Healthchecks", `"/fail"`), //nolint:lll
+					m.EXPECT().Infof(pp.EmojiPing, "Pinged the %s endpoint of Healthchecks", `"/fail"`),
 				)
 			},
 		},
@@ -189,7 +189,7 @@ func TestHealthchecksEndPoints(t *testing.T) {
 			func(m *mocks.MockPP) {
 				gomock.InOrder(
 					m.EXPECT().Warningf(pp.EmojiUserWarning, "The Healthchecks URL (redacted) uses HTTP; please consider using HTTPS"),
-					m.EXPECT().Infof(pp.EmojiNotification, "Successfully pinged the %s endpoint of Healthchecks", `"/log"`), //nolint:lll
+					m.EXPECT().Infof(pp.EmojiPing, "Pinged the %s endpoint of Healthchecks", `"/log"`),
 				)
 			},
 		},
@@ -204,7 +204,7 @@ func TestHealthchecksEndPoints(t *testing.T) {
 			func(m *mocks.MockPP) {
 				gomock.InOrder(
 					m.EXPECT().Warningf(pp.EmojiUserWarning, "The Healthchecks URL (redacted) uses HTTP; please consider using HTTPS"),
-					m.EXPECT().Infof(pp.EmojiNotification, "Successfully pinged the %s endpoint of Healthchecks", `"/0"`),
+					m.EXPECT().Infof(pp.EmojiPing, "Pinged the %s endpoint of Healthchecks", `"/0"`),
 				)
 			},
 		},
@@ -219,7 +219,7 @@ func TestHealthchecksEndPoints(t *testing.T) {
 			func(m *mocks.MockPP) {
 				gomock.InOrder(
 					m.EXPECT().Warningf(pp.EmojiUserWarning, "The Healthchecks URL (redacted) uses HTTP; please consider using HTTPS"),
-					m.EXPECT().Infof(pp.EmojiNotification, "Successfully pinged the %s endpoint of Healthchecks", `"/1"`),
+					m.EXPECT().Infof(pp.EmojiPing, "Pinged the %s endpoint of Healthchecks", `"/1"`),
 				)
 			},
 		},

diff --git a/internal/monitor/uptimekuma.go b/internal/monitor/uptimekuma.go
@@ -147,7 +147,7 @@ func (h *UptimeKuma) ping(ctx context.Context, ppfmt pp.PP, param UptimeKumaRequ
 		return false
 	}
 
-	ppfmt.Infof(pp.EmojiNotification, "Successfully pinged Uptime Kuma")
+	ppfmt.Infof(pp.EmojiPing, "Pinged Uptime Kuma")
 	return true
 }
 

diff --git a/internal/monitor/uptimekuma_test.go b/internal/monitor/uptimekuma_test.go
@@ -102,7 +102,7 @@ func TestUptimeKumaEndPoints(t *testing.T) {
 	successPP := func(m *mocks.MockPP) {
 		gomock.InOrder(
 			m.EXPECT().Warningf(pp.EmojiUserWarning, httpUnsafeMsg),
-			m.EXPECT().Infof(pp.EmojiNotification, "Successfully pinged Uptime Kuma"),
+			m.EXPECT().Infof(pp.EmojiPing, "Pinged Uptime Kuma"),
 		)
 	}
 

diff --git a/internal/notifier/shoutrrr.go b/internal/notifier/shoutrrr.go
@@ -56,9 +56,12 @@ func (s *Shoutrrr) Send(_ context.Context, ppfmt pp.PP, msg string) bool {
 	allOk := true
 	for _, err := range errs {
 		if err != nil {
-			ppfmt.Errorf(pp.EmojiUserError, "Failed to send message: %v", err)
+			ppfmt.Errorf(pp.EmojiError, "Failed to send some shoutrrr message: %v", err)
 			allOk = false
 		}
 	}
+	if allOk {
+		ppfmt.Infof(pp.EmojiNotification, "Sent shoutrrr message")
+	}
 	return allOk
 }
diff --git a/internal/notifier/shoutrrr_test.go b/internal/notifier/shoutrrr_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/favonia/cloudflare-ddns/internal/mocks"
 	"github.com/favonia/cloudflare-ddns/internal/notifier"
+	"github.com/favonia/cloudflare-ddns/internal/pp"
 )
 
 func TestShoutrrrDescripbe(t *testing.T) {
@@ -30,17 +31,29 @@ func TestShoutrrrSend(t *testing.T) {
 	t.Parallel()
 
 	for name, tc := range map[string]struct {
-		url           string
+		path          string
+		service       func(serverURL string) string
 		message       string
 		pinged        bool
 		ok            bool
 		prepareMockPP func(*mocks.MockPP)
 	}{
 		"success": {
-			"/", "hello",
+			"/greeting",
+			func(serverURL string) string { return "generic+" + serverURL + "/greeting" },
+			"hello",
 			true, true,
 			func(m *mocks.MockPP) {
-				gomock.InOrder()
+				m.EXPECT().Infof(pp.EmojiNotification, "Sent shoutrrr message")
+			},
+		},
+		"ill-formed url": {
+			"",
+			func(_serverURL string) string { return "generic+https://0.0.0.0" },
+			"hello",
+			false, false,
+			func(m *mocks.MockPP) {
+				m.EXPECT().Errorf(pp.EmojiError, "Failed to send some shoutrrr message: %v", gomock.Any())
 			},
 		},
 	} {
@@ -56,7 +69,7 @@ func TestShoutrrrSend(t *testing.T) {
 			pinged := false
 			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				require.Equal(t, http.MethodPost, r.Method)
-				require.Equal(t, tc.url, r.URL.EscapedPath())
+				require.Equal(t, tc.path, r.URL.EscapedPath())
 
 				reqBody, err := io.ReadAll(r.Body)
 				require.NoError(t, err)
@@ -65,7 +78,7 @@ func TestShoutrrrSend(t *testing.T) {
 				pinged = true
 			}))
 
-			s, ok := notifier.NewShoutrrr(mockPP, []string{"generic+" + server.URL + tc.url})
+			s, ok := notifier.NewShoutrrr(mockPP, []string{tc.service(server.URL)})
 			require.True(t, ok)
 			ok = s.Send(context.Background(), mockPP, tc.message)
 			require.Equal(t, tc.ok, ok)

diff --git a/internal/pp/emoji.go b/internal/pp/emoji.go
@@ -19,8 +19,8 @@ const (
 	EmojiUpdateRecord Emoji = "📡" // updating DNS records
 	EmojiClearRecord  Emoji = "🧹" // clearing DNS records
 
-	EmojiNotification Emoji = "🔔" // sending out notifications, pinging, health checks
-	EmojiRepeat       Emoji = "🔁" // repeating things
+	EmojiPing         Emoji = "🔔" // pinging and health checks
+	EmojiNotification Emoji = "📨" // notifications
 
 	EmojiSignal      Emoji = "🚨" // catching signals
 	EmojiAlreadyDone Emoji = "🤷" // DNS records were already up to date