Use mode in all tests

This commit is contained in:
Jannis Mattheis 2018-03-15 21:54:06 +01:00 committed by Jannis Mattheis
parent ff73e0b5e9
commit 9e49849039
9 changed files with 23 additions and 14 deletions

View File

@ -15,6 +15,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"github.com/gotify/server/mode"
) )
func TestMessageSuite(t *testing.T) { func TestMessageSuite(t *testing.T) {
@ -31,7 +32,7 @@ type MessageSuite struct {
} }
func (s *MessageSuite) BeforeTest(suiteName, testName string) { func (s *MessageSuite) BeforeTest(suiteName, testName string) {
gin.SetMode(gin.TestMode) mode.Set(mode.TestDev)
s.recorder = httptest.NewRecorder() s.recorder = httptest.NewRecorder()
s.ctx, _ = gin.CreateTestContext(s.recorder) s.ctx, _ = gin.CreateTestContext(s.recorder)
s.db = &apimock.MockMessageDatabase{} s.db = &apimock.MockMessageDatabase{}

View File

@ -14,6 +14,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"github.com/gotify/server/mode"
) )
var ( var (
@ -36,7 +37,7 @@ type TokenSuite struct {
} }
func (s *TokenSuite) BeforeTest(suiteName, testName string) { func (s *TokenSuite) BeforeTest(suiteName, testName string) {
gin.SetMode(gin.TestMode) mode.Set(mode.TestDev)
rand.Seed(50) rand.Seed(50)
s.recorder = httptest.NewRecorder() s.recorder = httptest.NewRecorder()
s.ctx, _ = gin.CreateTestContext(s.recorder) s.ctx, _ = gin.CreateTestContext(s.recorder)

View File

@ -15,6 +15,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"github.com/gotify/server/mode"
) )
var ( var (
@ -37,7 +38,7 @@ type UserSuite struct {
} }
func (s *UserSuite) BeforeTest(suiteName, testName string) { func (s *UserSuite) BeforeTest(suiteName, testName string) {
gin.SetMode(gin.TestMode) mode.Set(mode.TestDev)
s.recorder = httptest.NewRecorder() s.recorder = httptest.NewRecorder()
s.ctx, _ = gin.CreateTestContext(s.recorder) s.ctx, _ = gin.CreateTestContext(s.recorder)
s.db = &apimock.MockUserDatabase{} s.db = &apimock.MockUserDatabase{}

View File

@ -13,6 +13,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"github.com/gotify/server/mode"
) )
func TestSuite(t *testing.T) { func TestSuite(t *testing.T) {
@ -26,7 +27,7 @@ type AuthenticationSuite struct {
} }
func (s *AuthenticationSuite) SetupSuite() { func (s *AuthenticationSuite) SetupSuite() {
gin.SetMode(gin.TestMode) mode.Set(mode.TestDev)
s.DB = &authmock.MockDatabase{} s.DB = &authmock.MockDatabase{}
s.auth = &Auth{s.DB} s.auth = &Auth{s.DB}
s.DB.On("GetClientByToken", "clienttoken").Return(&model.Client{ID: 1, Token: "clienttoken", UserID: 1, Name: "android phone"}) s.DB.On("GetClientByToken", "clienttoken").Return(&model.Client{ID: 1, Token: "clienttoken", UserID: 1, Name: "android phone"})

View File

@ -8,6 +8,7 @@ import (
"github.com/gotify/server/model" "github.com/gotify/server/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"github.com/gotify/server/mode"
) )
func TestUtilSuite(t *testing.T) { func TestUtilSuite(t *testing.T) {
@ -19,7 +20,7 @@ type UtilSuite struct {
} }
func (s *UtilSuite) BeforeTest(suiteName, testName string) { func (s *UtilSuite) BeforeTest(suiteName, testName string) {
gin.SetMode(gin.TestMode) mode.Set(mode.TestDev)
} }
func (s *UtilSuite) Test_getID() { func (s *UtilSuite) Test_getID() {

View File

@ -6,10 +6,11 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/gotify/server/mode"
) )
func TestServe(t *testing.T) { func TestServe(t *testing.T) {
gin.SetMode(gin.TestMode) mode.Set(mode.TestDev)
recorder := httptest.NewRecorder() recorder := httptest.NewRecorder()
ctx, _ := gin.CreateTestContext(recorder) ctx, _ := gin.CreateTestContext(recorder)
ctx.Request = httptest.NewRequest("GET", "/swagger", nil) ctx.Request = httptest.NewRequest("GET", "/swagger", nil)

View File

@ -10,10 +10,11 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gotify/server/model" "github.com/gotify/server/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/gotify/server/mode"
) )
func TestDefaultErrorInternal(t *testing.T) { func TestDefaultErrorInternal(t *testing.T) {
gin.SetMode(gin.TestMode) mode.Set(mode.TestDev)
rec := httptest.NewRecorder() rec := httptest.NewRecorder()
ctx, _ := gin.CreateTestContext(rec) ctx, _ := gin.CreateTestContext(rec)
ctx.AbortWithError(500, errors.New("something went wrong")) ctx.AbortWithError(500, errors.New("something went wrong"))
@ -24,7 +25,7 @@ func TestDefaultErrorInternal(t *testing.T) {
} }
func TestBindingErrorDefault(t *testing.T) { func TestBindingErrorDefault(t *testing.T) {
gin.SetMode(gin.TestMode) mode.Set(mode.TestDev)
rec := httptest.NewRecorder() rec := httptest.NewRecorder()
ctx, _ := gin.CreateTestContext(rec) ctx, _ := gin.CreateTestContext(rec)
ctx.AbortWithError(400, errors.New("you need todo something")).SetType(gin.ErrorTypeBind) 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) { func TestDefaultErrorBadRequest(t *testing.T) {
gin.SetMode(gin.TestMode) mode.Set(mode.TestDev)
rec := httptest.NewRecorder() rec := httptest.NewRecorder()
ctx, _ := gin.CreateTestContext(rec) ctx, _ := gin.CreateTestContext(rec)
ctx.AbortWithError(400, errors.New("you need todo something")) ctx.AbortWithError(400, errors.New("you need todo something"))
@ -51,7 +52,7 @@ type testValidate struct {
} }
func TestValidationError(t *testing.T) { func TestValidationError(t *testing.T) {
gin.SetMode(gin.TestMode) mode.Set(mode.TestDev)
rec := httptest.NewRecorder() rec := httptest.NewRecorder()
ctx, _ := gin.CreateTestContext(rec) ctx, _ := gin.CreateTestContext(rec)
ctx.Request = httptest.NewRequest("GET", "/uri", nil) ctx.Request = httptest.NewRequest("GET", "/uri", nil)

View File

@ -5,10 +5,11 @@ import (
"testing" "testing"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gotify/server/mode"
) )
func TestNotFound(t *testing.T) { func TestNotFound(t *testing.T) {
gin.SetMode(gin.TestMode) mode.Set(mode.TestDev)
rec := httptest.NewRecorder() rec := httptest.NewRecorder()
ctx, _ := gin.CreateTestContext(rec) ctx, _ := gin.CreateTestContext(rec)

View File

@ -21,6 +21,7 @@ import (
"github.com/gotify/server/auth" "github.com/gotify/server/auth"
"github.com/gotify/server/model" "github.com/gotify/server/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/gotify/server/mode"
) )
func TestFailureOnNormalHttpRequest(t *testing.T) { func TestFailureOnNormalHttpRequest(t *testing.T) {
@ -296,7 +297,7 @@ func (c *testingClient) expectNoMessage() {
} }
func bootTestServer(handlerFunc gin.HandlerFunc) (*httptest.Server, *API) { func bootTestServer(handlerFunc gin.HandlerFunc) (*httptest.Server, *API) {
gin.SetMode(gin.TestMode) mode.Set(mode.TestDev)
r := gin.New() r := gin.New()
r.Use(handlerFunc) r.Use(handlerFunc)