Migrate from ginkgo v1 to ginkgo v2

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/cloudfoundry/libbuildpack v0.0.0-20260306121953-8ab9253c8181
 	github.com/cloudfoundry/switchblade v0.9.5
 	github.com/golang/mock v1.6.0
-	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/ginkgo/v2 v2.22.1
 	github.com/onsi/gomega v1.36.2
 	github.com/sclevine/spec v1.4.0
 	gopkg.in/jarcoal/httpmock.v1 v1.0.0-20181117152235-275e9df93516
@@ -36,7 +36,6 @@ require (
 	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/nxadm/tail v1.4.11 // indirect
-	github.com/onsi/ginkgo/v2 v2.22.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/paketo-buildpacks/packit v1.3.1 // indirect
@@ -58,7 +57,6 @@ require (
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/tools v0.29.0 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

src/nodejs/brats/brats_suite_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/cloudfoundry/libbuildpack/bratshelper"
 	"github.com/cloudfoundry/libbuildpack/cutlass"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

src/nodejs/brats/brats_test.go

@@ -3,7 +3,7 @@ package brats_test
 import (
 	"github.com/cloudfoundry/libbuildpack/bratshelper"
 	"github.com/cloudfoundry/libbuildpack/cutlass"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

src/nodejs/finalize/finalize_suite_test.go

@@ -1,7 +1,7 @@
 package finalize_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

src/nodejs/finalize/finalize_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/cloudfoundry/libbuildpack"
 	"github.com/cloudfoundry/libbuildpack/ansicleaner"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

src/nodejs/hooks/contrast_security_test.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/cloudfoundry/libbuildpack"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

src/nodejs/hooks/hooks_suite_test.go

@@ -3,7 +3,7 @@ package hooks_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"gopkg.in/jarcoal/httpmock.v1"

src/nodejs/hooks/sealights_test.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/cloudfoundry/libbuildpack"
 	"github.com/cloudfoundry/nodejs-buildpack/src/nodejs/hooks"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
@@ -293,7 +293,7 @@ var _ = Describe("Sealights hook", func() {
 			It("should use custom npmRunScript parameter for npm commands", func() {
 				err = os.WriteFile(filepath.Join(stager.BuildDir(), procfileName), []byte("web: npm run dev"), 0755)
 				Expect(err).To(BeNil())
-				
+
 				customPackageJson := "{\n    \"scripts\": {\n        \"dev\": \"" + originalStartCommand + "\",\n        \"start\": \"node index.js\"\n    }\n}"
 				err = os.WriteFile(filepath.Join(stager.BuildDir(), packageJsonName), []byte(customPackageJson), 0755)
 				Expect(err).To(BeNil())
@@ -314,10 +314,10 @@ var _ = Describe("Sealights hook", func() {
 
 				err = sealights.AfterCompile(stager)
 				Expect(err).To(BeNil())
-				
+
 				packageJson, err := sealights.ReadPackageJson(stager)
 				Expect(err).To(BeNil())
-				
+
 				devScript := packageJson["scripts"].(map[string]interface{})["dev"].(string)
 				Expect(devScript).To(ContainSubstring("slnodejs"))
 				Expect(devScript).To(ContainSubstring("index.js --build 192 --name Good"))
@@ -649,10 +649,10 @@ var _ = Describe("Sealights hook", func() {
 			BeforeEach(func() {
 				packageJson = map[string]interface{}{
 					"scripts": map[string]interface{}{
-						"start":    "node server.js",
-						"test":     "mocha",
-						"dev":      "nodemon server.js",
-						"build":    "webpack",
+						"start": "node server.js",
+						"test":  "mocha",
+						"dev":   "nodemon server.js",
+						"build": "webpack",
 					},
 				}
 			})
@@ -696,7 +696,7 @@ var _ = Describe("Sealights hook", func() {
 			BeforeEach(func() {
 				err = os.WriteFile(filepath.Join(stager.BuildDir(), procfileName), []byte("web: npm run custom-script"), 0755)
 				Expect(err).To(BeNil())
-				
+
 				customPackageJson := "{\n    \"scripts\": {\n        \"custom-script\": \"" + originalStartCommand + "\",\n        \"start\": \"node index.js\"\n    }\n}"
 				err = os.WriteFile(filepath.Join(stager.BuildDir(), packageJsonName), []byte(customPackageJson), 0755)
 				Expect(err).To(BeNil())
@@ -731,7 +731,7 @@ var _ = Describe("Sealights hook", func() {
 
 				packageJson, err := sealights.ReadPackageJson(stager)
 				Expect(err).To(BeNil())
-				
+
 				customScript := packageJson["scripts"].(map[string]interface{})["custom-script"].(string)
 				cleanResult := strings.ReplaceAll(customScript, " ", "")
 				Expect(cleanResult).To(Equal(expected))
@@ -746,7 +746,7 @@ var _ = Describe("Sealights hook", func() {
 
 				packageJson, err := sealights.ReadPackageJson(stager)
 				Expect(err).To(BeNil())
-				
+
 				startScript := packageJson["scripts"].(map[string]interface{})["start"].(string)
 				Expect(startScript).To(ContainSubstring("slnodejs"))
 			})

src/nodejs/hooks/seeker_agent_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/cloudfoundry/libbuildpack"
 	"github.com/cloudfoundry/nodejs-buildpack/src/nodejs/hooks"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

src/nodejs/hooks/snyk_test.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/cloudfoundry/nodejs-buildpack/src/nodejs/hooks"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

src/nodejs/npm/npm_suite_test.go

@@ -1,7 +1,7 @@
 package npm_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

src/nodejs/npm/npm_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/cloudfoundry/libbuildpack"
 	"github.com/cloudfoundry/libbuildpack/ansicleaner"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

src/nodejs/supply/supply_suite_test.go

@@ -1,7 +1,7 @@
 package supply_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

src/nodejs/supply/supply_test.go

@@ -11,8 +11,7 @@ import (
 	"github.com/cloudfoundry/libbuildpack/ansicleaner"
 	"github.com/cloudfoundry/nodejs-buildpack/src/nodejs/supply"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

src/nodejs/yarn/yarn_suite_test.go

@@ -1,7 +1,7 @@
 package yarn_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

src/nodejs/yarn/yarn_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/cloudfoundry/libbuildpack"
 	"github.com/cloudfoundry/libbuildpack/ansicleaner"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )