Merge pull request #933 from gofiber/testify

Add support for using stretchr/testify during tests
gofiber · Aug 23, 2023 · 4248a8d · 4248a8d
2 parents 5253118 + 5ac0392
commit 4248a8d
Show file tree

Hide file tree

Showing 107 changed files with 1,158 additions and 1,634 deletions.
diff --git a/.github/workflows/test-arangodb.yml b/.github/workflows/test-arangodb.yml
@@ -22,10 +22,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v3

diff --git a/.github/workflows/test-azureblob.yml b/.github/workflows/test-azureblob.yml
@@ -15,9 +15,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
         -   name: Install Azurite
             run: |

diff --git a/.github/workflows/test-badger.yml b/.github/workflows/test-badger.yml
@@ -14,9 +14,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         runs-on: ubuntu-latest
         steps:
             -   name: Fetch Repository

diff --git a/.github/workflows/test-bbolt.yml b/.github/workflows/test-bbolt.yml
@@ -15,9 +15,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v3

diff --git a/.github/workflows/test-couchbase.yml b/.github/workflows/test-couchbase.yml
@@ -17,6 +17,7 @@ jobs:
         go-version:
           - 1.19.x
           - 1.20.x
+          - 1.21.x
     steps:
       - name: Fetch Repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/test-dynamodb.yml b/.github/workflows/test-dynamodb.yml
@@ -20,10 +20,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v3

diff --git a/.github/workflows/test-etcd.yml b/.github/workflows/test-etcd.yml
@@ -17,6 +17,7 @@ jobs:
                 go-version:
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v3

diff --git a/.github/workflows/test-memcache.yml b/.github/workflows/test-memcache.yml
@@ -20,10 +20,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v3

diff --git a/.github/workflows/test-memory.yml b/.github/workflows/test-memory.yml
@@ -14,10 +14,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         runs-on: ubuntu-latest
         steps:
             -   name: Fetch Repository

diff --git a/.github/workflows/test-mongodb.yml b/.github/workflows/test-mongodb.yml
@@ -20,10 +20,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v3

diff --git a/.github/workflows/test-mssql.yml b/.github/workflows/test-mssql.yml
@@ -32,9 +32,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v3

diff --git a/.github/workflows/test-mysql.yml b/.github/workflows/test-mysql.yml
@@ -28,10 +28,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v3

diff --git a/.github/workflows/test-pebble.yml b/.github/workflows/test-pebble.yml
@@ -16,6 +16,7 @@ jobs:
         go-version:
           - 1.19.x
           - 1.20.x
+          - 1.21.x
     runs-on: ubuntu-latest
     steps:
     -   name: Fetch Repository

diff --git a/.github/workflows/test-postgres.yml b/.github/workflows/test-postgres.yml
@@ -29,6 +29,7 @@ jobs:
                 go-version:
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v3

diff --git a/.github/workflows/test-redis.yml b/.github/workflows/test-redis.yml
@@ -15,9 +15,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
                 redis:
                     - '6.x'
                     - '7.x'
@@ -41,7 +41,7 @@ jobs:
                     --tls-ca-cert-file ./redis/tests/tls/ca.crt&
 
             -   name: Setup Redis Cluster
-                uses: vishnudxb/redis-cluster@1.0.5
+                uses: vishnudxb/redis-cluster@1.0.8
                 with:
                     master1-port: 7000
                     master2-port: 7001

diff --git a/.github/workflows/test-ristretto.yml b/.github/workflows/test-ristretto.yml
@@ -15,9 +15,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v3

diff --git a/.github/workflows/test-s3.yml b/.github/workflows/test-s3.yml
@@ -15,9 +15,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
         -   name: Install MinIO
             run: |

diff --git a/.github/workflows/test-sqlite3.yml b/.github/workflows/test-sqlite3.yml
@@ -14,10 +14,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         runs-on: ubuntu-latest
         steps:
             -   name: Fetch Repository

diff --git a/arangodb/README.md b/arangodb/README.md
@@ -11,6 +11,8 @@ title: ArangoDB
 
 A ArangoDB storage driver using `arangodb/go-driver` and [arangodb/go-driver](https://github.com/arangodb/go-driver).
 
+**Note: Requires Go 1.19 and above**
+
 ### Table of Contents
 - [Signatures](#signatures)
 - [Installation](#installation)
@@ -35,13 +37,13 @@ go mod init github.com/<user>/<repo>
 ```
 And then install the mysql implementation:
 ```bash
-go get github.com/gofiber/storage/arangodb
+go get github.com/gofiber/storage/arangodb/v2
 ```
 
 ### Examples
 Import the storage package.
 ```go
-import "github.com/gofiber/storage/arangodb"
+import "github.com/gofiber/storage/arangodb/v2"
 ```
 
 You can use the following possibilities to create a storage:

diff --git a/arangodb/arangodb.go b/arangodb/arangodb.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/arangodb/go-driver"
 	"github.com/arangodb/go-driver/http"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // Storage interface that is implemented by storage providers

diff --git a/arangodb/arangodb_test.go b/arangodb/arangodb_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/stretchr/testify/require"
 )
 
 var testStore = New(Config{
@@ -18,7 +18,7 @@ func Test_ARANGODB_Set(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
 func Test_ARANGODB_Upsert(t *testing.T) {
@@ -28,10 +28,10 @@ func Test_ARANGODB_Upsert(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
 func Test_ARANGODB_Get(t *testing.T) {
@@ -41,11 +41,11 @@ func Test_ARANGODB_Get(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, val, result)
+	require.NoError(t, err)
+	require.Equal(t, val, result)
 }
 
 func Test_ARANGODB_Set_Expiration(t *testing.T) {
@@ -56,26 +56,23 @@ func Test_ARANGODB_Set_Expiration(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, exp)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	time.Sleep(1100 * time.Millisecond)
 }
 
 func Test_ARANGODB_Get_Expired(t *testing.T) {
-	var (
-		key = "john"
-	)
+	key := "john"
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_ARANGODB_Get_NotExist(t *testing.T) {
-
 	result, err := testStore.Get("notexist")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_ARANGODB_Delete(t *testing.T) {
@@ -85,54 +82,52 @@ func Test_ARANGODB_Delete(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Delete(key)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_ARANGODB_Reset(t *testing.T) {
-	var (
-		val = []byte("doe")
-	)
+	val := []byte("doe")
 
 	err := testStore.Set("john1", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set("john2", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Reset()
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get("john1")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 
 	result, err = testStore.Get("john2")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_ARANGODB_Non_UTF8(t *testing.T) {
 	val := []byte("0xF5")
 
 	err := testStore.Set("0xF6", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get("0xF6")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, val, result)
+	require.NoError(t, err)
+	require.Equal(t, val, result)
 }
 
 func Test_ARANGODB_Close(t *testing.T) {
-	utils.AssertEqual(t, nil, testStore.Close())
+	require.Nil(t, testStore.Close())
 }
 
 func Test_ARANGODB_Conn(t *testing.T) {
-	utils.AssertEqual(t, true, testStore.Conn() != nil)
+	require.True(t, testStore.Conn() != nil)
 }