WebhookNotifier: Convert tests away from goconvey (#29291)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

pkg/services/alerting/notifiers/webhook_test.go

@@ -5,33 +5,31 @@ import (
 
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/models"
 	"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))
+		settingsJSON, err := simplejson.NewJson([]byte(json))
+		require.NoError(t, err)
 		model := &models.AlertNotification{
 		model := &models.AlertNotification{
 			Name:     "ops",
 			Name:     "ops",
 			Type:     "webhook",
 			Type:     "webhook",
 			Settings: settingsJSON,
 			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))
+		settingsJSON, err := simplejson.NewJson([]byte(json))
+		require.NoError(t, err)
 		model := &models.AlertNotification{
 		model := &models.AlertNotification{
 			Name:     "ops",
 			Name:     "ops",
 			Type:     "webhook",
 			Type:     "webhook",
@@ -39,13 +37,11 @@ func TestWebhookNotifier(t *testing.T) {
 		}
 		}
 
 
 		not, err := NewWebHookNotifier(model)
 		not, err := NewWebHookNotifier(model)
+		require.NoError(t, err)
 		webhookNotifier := not.(*WebhookNotifier)
 		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)
 	})
 	})
 }
 }