Skip to content

Commit

Permalink
Merge pull request #192 from imuni4fun/testify-fix
Browse files Browse the repository at this point in the history
fixed interface compatibility issues with testify v1.8.2
  • Loading branch information
System-Glitch authored Apr 4, 2023
2 parents 2773c61 + 68fc28a commit b58acd0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/google/uuid v1.3.0
github.com/gorilla/websocket v1.5.0
github.com/imdario/mergo v0.3.13
github.com/stretchr/testify v1.8.1
github.com/stretchr/testify v1.8.2
golang.org/x/crypto v0.4.0
gorm.io/driver/mysql v1.4.4
gorm.io/driver/postgres v1.4.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
Expand Down
2 changes: 2 additions & 0 deletions testsuite.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"goyave.dev/goyave/v4/util/fsutil"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
testify "github.com/stretchr/testify/suite"
"goyave.dev/goyave/v4/config"
"goyave.dev/goyave/v4/lang"
Expand All @@ -44,6 +45,7 @@ type ITestSuite interface {

T() *testing.T
SetT(*testing.T)
SetS(suite suite.TestingSuite)

GetBody(*http.Response) []byte
GetJSONBody(*http.Response, interface{}) error
Expand Down

0 comments on commit b58acd0

Please sign in to comment.