Convert to ginkgo v2

Dariquest · Apr 5, 2023 · aa72ec8 · aa72ec8
1 parent 8ff8fd8
commit aa72ec8
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -163,7 +163,7 @@ the repo and change directory to `src/code.cloudfoundry.org`
 
 1. Install the ginkgo binary with `go get`:
   ```bash
-  go get github.com/onsi/ginkgo/ginkgo
+  go get github.com/onsi/ginkgo/v2/ginkgo
   ```
 
 1. Run tests, by running the following command from root of this repository

diff --git a/commandrunner/commandrunner_suite_test.go b/commandrunner/commandrunner_suite_test.go
@@ -1,7 +1,7 @@
 package commandrunner_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

diff --git a/commandrunner/runner_test.go b/commandrunner/runner_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"code.cloudfoundry.org/route-registrar/commandrunner"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 
@@ -54,7 +54,6 @@ var _ = Describe("CommandRunner", func() {
 		tmpGoPkgPath, err = ioutil.TempDir(filepath.Join(gopath, "src", "code.cloudfoundry.org"), "tmp-foo")
 		Expect(err).NotTo(HaveOccurred())
 
-
 		outbuf = bytes.Buffer{}
 		errbuf = bytes.Buffer{}
 	})

diff --git a/config/config_suite_test.go b/config/config_suite_test.go
@@ -1,7 +1,7 @@
 package config_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

diff --git a/config/config_test.go b/config/config_test.go
@@ -8,7 +8,7 @@ import (
 
 	"code.cloudfoundry.org/route-registrar/config"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 )

diff --git a/healthchecker/healthchecker_suite_test.go b/healthchecker/healthchecker_suite_test.go
@@ -3,7 +3,7 @@ package healthchecker_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/healthchecker/script_checker_test.go b/healthchecker/script_checker_test.go
@@ -11,7 +11,7 @@ import (
 
 	"code.cloudfoundry.org/route-registrar/commandrunner/fakes"
 	"code.cloudfoundry.org/route-registrar/healthchecker"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 

diff --git a/integration/init_test.go b/integration/init_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 

diff --git a/integration/main_test.go b/integration/main_test.go
@@ -19,7 +19,7 @@ import (
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/integration/tcp_route_registration_test.go b/integration/tcp_route_registration_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/onsi/gomega/gexec"
 	"github.com/onsi/gomega/ghttp"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/messagebus/messagebus_suite_test.go b/messagebus/messagebus_suite_test.go
@@ -3,8 +3,7 @@ package messagebus_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/config"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
@@ -19,5 +18,5 @@ func TestMessagebus(t *testing.T) {
 }
 
 var _ = BeforeSuite(func() {
-	natsPort = 20000 + config.GinkgoConfig.ParallelNode
+	natsPort = 20000 + GinkgoParallelNode()
 })
diff --git a/messagebus/messagebus_test.go b/messagebus/messagebus_test.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 

diff --git a/registrar/registrar_suite_test.go b/registrar/registrar_suite_test.go
@@ -3,8 +3,7 @@ package registrar_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/config"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
@@ -19,5 +18,5 @@ func TestRoute_register(t *testing.T) {
 }
 
 var _ = BeforeSuite(func() {
-	natsPort = 40000 + config.GinkgoConfig.ParallelNode
+	natsPort = 40000 + GinkgoParallelNode()
 })
diff --git a/registrar/registrar_test.go b/registrar/registrar_test.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/nats-io/nats.go"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	tls_helpers "code.cloudfoundry.org/cf-routing-test-helpers/tls"

diff --git a/routingapi/api_test.go b/routingapi/api_test.go
@@ -3,7 +3,7 @@ package routingapi
 import (
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"golang.org/x/oauth2"
 

diff --git a/routingapi/init_test.go b/routingapi/init_test.go
@@ -3,7 +3,7 @@ package routingapi_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/routingapi/routingapi_test.go b/routingapi/routingapi_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"golang.org/x/oauth2"