Chore: Refactor GoConvey in notification service package (#40897)

* refactor goconvey in notification service package

* avoid return after t.skip
This commit is contained in:
Serge Zaitsev
2021-10-26 18:08:04 +02:00
committed by GitHub
parent 1f1162f1d8
commit 125e284da2
2 changed files with 23 additions and 19 deletions
+12 -11
View File
@@ -5,34 +5,35 @@ import (
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
. "github.com/smartystreets/goconvey/convey"
"github.com/stretchr/testify/require"
)
func TestEmailCodes(t *testing.T) {
Convey("When generating code", t, func() {
t.Run("When generating code", func(t *testing.T) {
cfg := setting.NewCfg()
cfg.EmailCodeValidMinutes = 120
user := &models.User{Id: 10, Email: "t@a.com", Login: "asd", Password: "1", Rands: "2"}
code, err := createUserEmailCode(cfg, user, nil)
So(err, ShouldBeNil)
require.NoError(t, err)
Convey("getLoginForCode should return login", func() {
t.Run("getLoginForCode should return login", func(t *testing.T) {
login := getLoginForEmailCode(code)
So(login, ShouldEqual, "asd")
require.Equal(t, login, "asd")
})
Convey("Can verify valid code", func() {
t.Run("Can verify valid code", func(t *testing.T) {
isValid, err := validateUserEmailCode(cfg, user, code)
So(err, ShouldBeNil)
So(isValid, ShouldBeTrue)
require.NoError(t, err)
require.True(t, isValid)
})
Convey("Cannot verify in-valid code", func() {
t.Run("Cannot verify in-valid code", func(t *testing.T) {
code = "ASD"
isValid, err := validateUserEmailCode(cfg, user, code)
So(err, ShouldBeNil)
So(isValid, ShouldBeFalse)
require.NoError(t, err)
require.False(t, isValid)
})
})
}