diff --git a/api/message_test.go b/api/message_test.go index 4dac77c..62a169b 100644 --- a/api/message_test.go +++ b/api/message_test.go @@ -15,6 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" + "github.com/gotify/server/mode" ) func TestMessageSuite(t *testing.T) { @@ -31,7 +32,7 @@ type MessageSuite struct { } func (s *MessageSuite) BeforeTest(suiteName, testName string) { - gin.SetMode(gin.TestMode) + mode.Set(mode.TestDev) s.recorder = httptest.NewRecorder() s.ctx, _ = gin.CreateTestContext(s.recorder) s.db = &apimock.MockMessageDatabase{} @@ -60,7 +61,7 @@ func (s *MessageSuite) Test_GetMessagesWithToken() { auth.RegisterAuthentication(s.ctx, nil, 4, "") t, _ := time.Parse("2006/01/02", "2021/01/02") s.db.On("GetMessagesByApplication", uint(1)).Return([]*model.Message{{ID: 2, ApplicationID: 1, Message: "hi", Title: "hi", Date: t, Priority: 4}}) - s.db.On("GetApplicationByID", uint(1)).Return(&model.Application{ID: 1, Token:"irrelevant", UserID: 4}) + s.db.On("GetApplicationByID", uint(1)).Return(&model.Application{ID: 1, Token: "irrelevant", UserID: 4}) s.ctx.Params = gin.Params{{Key: "id", Value: "1"}} s.a.GetMessagesWithApplication(s.ctx) @@ -73,7 +74,7 @@ func (s *MessageSuite) Test_GetMessagesWithToken() { func (s *MessageSuite) Test_GetMessagesWithToken_withWrongUser_expectNotFound() { auth.RegisterAuthentication(s.ctx, nil, 4, "") t, _ := time.Parse("2006/01/02", "2021/01/02") - s.db.On("GetApplicationByID", uint(1)).Return(&model.Application{ID: 1, Token:"irrelevant", UserID: 2}) + s.db.On("GetApplicationByID", uint(1)).Return(&model.Application{ID: 1, Token: "irrelevant", UserID: 2}) s.db.On("GetMessagesByApplication", uint(1)).Return([]*model.Message{{ID: 2, ApplicationID: 1, Message: "hi", Title: "hi", Date: t, Priority: 4}}) s.ctx.Params = gin.Params{{Key: "id", Value: "1"}} diff --git a/api/token_test.go b/api/token_test.go index 7826c87..8b99ce4 100644 --- a/api/token_test.go +++ b/api/token_test.go @@ -14,6 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" + "github.com/gotify/server/mode" ) var ( @@ -36,7 +37,7 @@ type TokenSuite struct { } func (s *TokenSuite) BeforeTest(suiteName, testName string) { - gin.SetMode(gin.TestMode) + mode.Set(mode.TestDev) rand.Seed(50) s.recorder = httptest.NewRecorder() s.ctx, _ = gin.CreateTestContext(s.recorder) diff --git a/api/user_test.go b/api/user_test.go index f358c9a..ddee6ed 100644 --- a/api/user_test.go +++ b/api/user_test.go @@ -15,6 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" + "github.com/gotify/server/mode" ) var ( @@ -37,7 +38,7 @@ type UserSuite struct { } func (s *UserSuite) BeforeTest(suiteName, testName string) { - gin.SetMode(gin.TestMode) + mode.Set(mode.TestDev) s.recorder = httptest.NewRecorder() s.ctx, _ = gin.CreateTestContext(s.recorder) s.db = &apimock.MockUserDatabase{} diff --git a/auth/authentication_test.go b/auth/authentication_test.go index 7ee0878..a7bf1fc 100644 --- a/auth/authentication_test.go +++ b/auth/authentication_test.go @@ -13,6 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" + "github.com/gotify/server/mode" ) func TestSuite(t *testing.T) { @@ -26,7 +27,7 @@ type AuthenticationSuite struct { } func (s *AuthenticationSuite) SetupSuite() { - gin.SetMode(gin.TestMode) + mode.Set(mode.TestDev) s.DB = &authmock.MockDatabase{} s.auth = &Auth{s.DB} s.DB.On("GetClientByToken", "clienttoken").Return(&model.Client{ID: 1, Token: "clienttoken", UserID: 1, Name: "android phone"}) diff --git a/auth/util_test.go b/auth/util_test.go index 811a57c..d0a8af9 100644 --- a/auth/util_test.go +++ b/auth/util_test.go @@ -8,6 +8,7 @@ import ( "github.com/gotify/server/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" + "github.com/gotify/server/mode" ) func TestUtilSuite(t *testing.T) { @@ -19,7 +20,7 @@ type UtilSuite struct { } func (s *UtilSuite) BeforeTest(suiteName, testName string) { - gin.SetMode(gin.TestMode) + mode.Set(mode.TestDev) } func (s *UtilSuite) Test_getID() { diff --git a/docs/swagger_test.go b/docs/swagger_test.go index 3d30979..cd2af99 100644 --- a/docs/swagger_test.go +++ b/docs/swagger_test.go @@ -6,10 +6,11 @@ import ( "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" + "github.com/gotify/server/mode" ) func TestServe(t *testing.T) { - gin.SetMode(gin.TestMode) + mode.Set(mode.TestDev) recorder := httptest.NewRecorder() ctx, _ := gin.CreateTestContext(recorder) ctx.Request = httptest.NewRequest("GET", "/swagger", nil) diff --git a/error/handler_test.go b/error/handler_test.go index 763fb60..0295b9e 100644 --- a/error/handler_test.go +++ b/error/handler_test.go @@ -10,10 +10,11 @@ import ( "github.com/gin-gonic/gin" "github.com/gotify/server/model" "github.com/stretchr/testify/assert" + "github.com/gotify/server/mode" ) func TestDefaultErrorInternal(t *testing.T) { - gin.SetMode(gin.TestMode) + mode.Set(mode.TestDev) rec := httptest.NewRecorder() ctx, _ := gin.CreateTestContext(rec) ctx.AbortWithError(500, errors.New("something went wrong")) @@ -24,7 +25,7 @@ func TestDefaultErrorInternal(t *testing.T) { } func TestBindingErrorDefault(t *testing.T) { - gin.SetMode(gin.TestMode) + mode.Set(mode.TestDev) rec := httptest.NewRecorder() ctx, _ := gin.CreateTestContext(rec) ctx.AbortWithError(400, errors.New("you need todo something")).SetType(gin.ErrorTypeBind) @@ -35,7 +36,7 @@ func TestBindingErrorDefault(t *testing.T) { } func TestDefaultErrorBadRequest(t *testing.T) { - gin.SetMode(gin.TestMode) + mode.Set(mode.TestDev) rec := httptest.NewRecorder() ctx, _ := gin.CreateTestContext(rec) ctx.AbortWithError(400, errors.New("you need todo something")) @@ -51,7 +52,7 @@ type testValidate struct { } func TestValidationError(t *testing.T) { - gin.SetMode(gin.TestMode) + mode.Set(mode.TestDev) rec := httptest.NewRecorder() ctx, _ := gin.CreateTestContext(rec) ctx.Request = httptest.NewRequest("GET", "/uri", nil) diff --git a/error/notfound_test.go b/error/notfound_test.go index 6046e12..00e7a3b 100644 --- a/error/notfound_test.go +++ b/error/notfound_test.go @@ -5,10 +5,11 @@ import ( "testing" "github.com/gin-gonic/gin" + "github.com/gotify/server/mode" ) func TestNotFound(t *testing.T) { - gin.SetMode(gin.TestMode) + mode.Set(mode.TestDev) rec := httptest.NewRecorder() ctx, _ := gin.CreateTestContext(rec) diff --git a/stream/stream_test.go b/stream/stream_test.go index 0667e2c..d253611 100644 --- a/stream/stream_test.go +++ b/stream/stream_test.go @@ -21,6 +21,7 @@ import ( "github.com/gotify/server/auth" "github.com/gotify/server/model" "github.com/stretchr/testify/assert" + "github.com/gotify/server/mode" ) func TestFailureOnNormalHttpRequest(t *testing.T) { @@ -296,7 +297,7 @@ func (c *testingClient) expectNoMessage() { } func bootTestServer(handlerFunc gin.HandlerFunc) (*httptest.Server, *API) { - gin.SetMode(gin.TestMode) + mode.Set(mode.TestDev) r := gin.New() r.Use(handlerFunc)