chore(deps): Moving to latest version of gomega and ginko

elliotcourant · elliotcourant · commit adbf23696221 · 2023-02-20T16:48:56.000-06:00
diff --git a/db_test.go b/db_test.go
@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/stretchr/testify/require"
 
diff --git a/go.mod b/go.mod
@@ -3,22 +3,16 @@ module github.com/go-pg/pg/v10
 go 1.11
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-pg/zerochecker v0.2.0
-	github.com/golang/protobuf v1.4.3 // indirect
-	github.com/google/go-cmp v0.5.5 // indirect
 	github.com/jinzhu/inflection v1.0.0
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/onsi/ginkgo v1.14.2
-	github.com/onsi/gomega v1.10.3
+	github.com/onsi/ginkgo/v2 v2.8.3
+	github.com/onsi/gomega v1.27.1
 	github.com/stretchr/testify v1.7.0
 	github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc
 	github.com/vmihailenco/bufpool v0.1.11
 	github.com/vmihailenco/msgpack/v5 v5.3.4
 	github.com/vmihailenco/tagparser v0.1.2
-	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
-	golang.org/x/sys v0.0.0-20210923061019-b8560ed6a9b7 // indirect
-	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f
 	mellium.im/sasl v0.3.1
 )
diff --git a/go.sum b/go.sum
diff --git a/hook_test.go b/hook_test.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/go-pg/pg/v10"
diff --git a/internal/pool/main_test.go b/internal/pool/main_test.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/internal/pool/pool_sticky_test.go b/internal/pool/pool_sticky_test.go
@@ -3,7 +3,7 @@ package pool_test
 import (
 	"context"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/go-pg/pg/v10/internal/pool"
diff --git a/internal/pool/pool_test.go b/internal/pool/pool_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-pg/pg/v10/internal/pool"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/listener_test.go b/listener_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-pg/pg/v10"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/main_test.go b/main_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "gopkg.in/check.v1"
 
 	"github.com/go-pg/pg/v10"
diff --git a/orm/delete_test.go b/orm/delete_test.go
@@ -1,7 +1,7 @@
 package orm
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/orm/insert_test.go b/orm/insert_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/go-pg/pg/v10/types"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/orm/join_test.go b/orm/join_test.go
@@ -1,7 +1,7 @@
 package orm
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/orm/main_test.go b/orm/main_test.go
@@ -3,7 +3,7 @@ package orm_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/orm/query_test.go b/orm/query_test.go
@@ -3,7 +3,7 @@ package orm
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/orm/select_nil_test.go b/orm/select_nil_test.go
@@ -3,7 +3,7 @@ package orm
 import (
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/orm/select_test.go b/orm/select_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/stretchr/testify/require"
 
diff --git a/orm/table_create_test.go b/orm/table_create_test.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/orm/table_drop_test.go b/orm/table_drop_test.go
@@ -1,7 +1,7 @@
 package orm
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/orm/table_test.go b/orm/table_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/go-pg/pg/v10/types"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/orm/update_test.go b/orm/update_test.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/go-pg/pg/v10/types"
diff --git a/race_test.go b/race_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-pg/pg/v10"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/tx_test.go b/tx_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/go-pg/pg/v10"

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"sync"`
`7`	`7`	`"testing"`
`8`	`8`
`9`		`- . "github.com/onsi/ginkgo"`
	`9`	`+ . "github.com/onsi/ginkgo/v2"`
`10`	`10`	`. "github.com/onsi/gomega"`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/go-pg/pg/v10/internal/pool"`
`10`	`10`
`11`		`- . "github.com/onsi/ginkgo"`
	`11`	`+ . "github.com/onsi/ginkgo/v2"`
`12`	`12`	`. "github.com/onsi/gomega"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/go-pg/pg/v10"`
`8`	`8`
`9`		`- . "github.com/onsi/ginkgo"`
	`9`	`+ . "github.com/onsi/ginkgo/v2"`
`10`	`10`	`. "github.com/onsi/gomega"`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package orm`
`2`	`2`
`3`	`3`	`import (`
`4`		`- . "github.com/onsi/ginkgo"`
	`4`	`+ . "github.com/onsi/ginkgo/v2"`
`5`	`5`	`. "github.com/onsi/gomega"`
`6`	`6`	`)`
`7`	`7`