From 063f863abc7896825c3c9f2fab4ac7b22f18947e Mon Sep 17 00:00:00 2001
From: Arve Knudsen <arve.knudsen@gmail.com>
Date: Mon, 23 Nov 2020 10:37:53 +0100
Subject: [PATCH] WebhookNotifier: Convert tests away from goconvey (#29291)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
---
 .../alerting/notifiers/webhook_test.go        | 64 +++++++++----------
 1 file changed, 30 insertions(+), 34 deletions(-)

diff --git a/pkg/services/alerting/notifiers/webhook_test.go b/pkg/services/alerting/notifiers/webhook_test.go
index 6f311ba39e6..4af905802d1 100644
--- a/pkg/services/alerting/notifiers/webhook_test.go
+++ b/pkg/services/alerting/notifiers/webhook_test.go
@@ -5,47 +5,43 @@ import (
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/models"
-	. "github.com/smartystreets/goconvey/convey"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
-func TestWebhookNotifier(t *testing.T) {
-	Convey("Webhook notifier tests", t, func() {
-		Convey("Parsing alert notification from settings", func() {
-			Convey("empty settings should return error", func() {
-				json := `{ }`
+func TestWebhookNotifier_parsingFromSettings(t *testing.T) {
+	t.Run("Empty settings should cause error", func(t *testing.T) {
+		const json = `{}`
 
-				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &models.AlertNotification{
-					Name:     "ops",
-					Type:     "webhook",
-					Settings: settingsJSON,
-				}
+		settingsJSON, err := simplejson.NewJson([]byte(json))
+		require.NoError(t, err)
+		model := &models.AlertNotification{
+			Name:     "ops",
+			Type:     "webhook",
+			Settings: settingsJSON,
+		}
 
-				_, err := NewWebHookNotifier(model)
-				So(err, ShouldNotBeNil)
-			})
+		_, err = NewWebHookNotifier(model)
+		require.Error(t, err)
+	})
 
-			Convey("from settings", func() {
-				json := `
-				{
-          "url": "http://google.com"
-				}`
+	t.Run("Valid settings should result in a valid notifier", func(t *testing.T) {
+		const json = `{"url": "http://google.com"}`
 
-				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &models.AlertNotification{
-					Name:     "ops",
-					Type:     "webhook",
-					Settings: settingsJSON,
-				}
+		settingsJSON, err := simplejson.NewJson([]byte(json))
+		require.NoError(t, err)
+		model := &models.AlertNotification{
+			Name:     "ops",
+			Type:     "webhook",
+			Settings: settingsJSON,
+		}
 
-				not, err := NewWebHookNotifier(model)
-				webhookNotifier := not.(*WebhookNotifier)
+		not, err := NewWebHookNotifier(model)
+		require.NoError(t, err)
+		webhookNotifier := not.(*WebhookNotifier)
 
-				So(err, ShouldBeNil)
-				So(webhookNotifier.Name, ShouldEqual, "ops")
-				So(webhookNotifier.Type, ShouldEqual, "webhook")
-				So(webhookNotifier.URL, ShouldEqual, "http://google.com")
-			})
-		})
+		assert.Equal(t, "ops", webhookNotifier.Name)
+		assert.Equal(t, "webhook", webhookNotifier.Type)
+		assert.Equal(t, "http://google.com", webhookNotifier.URL)
 	})
 }