Skip to content

refactor: migrate test suite from Ginkgo v1 to v2 #554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnikolova82 merged 4 commits into from
Mar 6, 2026
Merged

refactor: migrate test suite from Ginkgo v1 to v2 #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7a75e5
migrate to ginkgo v2
ramonskie Mar 2, 2026
e879d59
refactor: migrate Ginkgo v1 AfterEach cleanup to v2 DeferCleanup
ramonskie Mar 2, 2026
635cf3b
fix: install ginkgo v2 CLI in unit test script
ramonskie Mar 2, 2026
278fdc1
fix: resolve go vet non-constant format string errors
ramonskie Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
28 changes: 16 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/cloudfoundry/go-buildpack

go 1.23.0

toolchain go1.24.0
go 1.24.0

require (
github.com/Dynatrace/libbuildpack-dynatrace v1.8.0
Expand All @@ -12,14 +10,15 @@ require (
github.com/cloudfoundry/switchblade v0.9.4
github.com/golang/mock v1.6.0
github.com/kr/go-heroku-example v0.0.0-20150601175414-712a6d2f98f1
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.36.2
github.com/onsi/ginkgo/v2 v2.28.1
github.com/onsi/gomega v1.39.0
github.com/sclevine/spec v1.4.0
github.com/vendorlib v0.0.0-00010101000000-000000000000
)

require (
code.cloudfoundry.org/lager v2.0.0+incompatible // indirect
github.com/Masterminds/semver/v3 v3.4.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
Expand All @@ -32,18 +31,20 @@ require (
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/nxadm/tail v1.4.11 // indirect
github.com/onsi/ginkgo v1.16.5 // 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
github.com/paketo-buildpacks/packit/v2 v2.16.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 // indirect
github.com/tidwall/gjson v1.18.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
Expand All @@ -55,14 +56,17 @@ require (
go.opentelemetry.io/otel/metric v1.32.0 // indirect
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
go.opentelemetry.io/otel/trace v1.32.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/mod v0.32.0 // indirect
golang.org/x/net v0.49.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/text v0.33.0 // indirect
golang.org/x/tools v0.41.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // 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
)

exclude google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd
Expand Down
64 changes: 44 additions & 20 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/.util/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function util::tools::ginkgo::install() {
pushd /tmp > /dev/null || return
GOBIN="${dir}" \
go install \
github.com/onsi/ginkgo/ginkgo@latest
github.com/onsi/ginkgo/v2/ginkgo@latest
popd > /dev/null || return
fi
}
Expand Down
2 changes: 1 addition & 1 deletion src/go/brats/brats_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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"
)

Expand Down
2 changes: 1 addition & 1 deletion src/go/brats/brats_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
12 changes: 6 additions & 6 deletions src/go/finalize/finalize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ func (gf *Finalizer) SetMainPackageName() error {
case "go_nativevendoring":
gf.MainPackageName = os.Getenv("GOPACKAGENAME")
if gf.MainPackageName == "" {
gf.Log.Error(warnings.NoGOPACKAGENAMEerror())
gf.Log.Error("%s", warnings.NoGOPACKAGENAMEerror())
return errors.New("GOPACKAGENAME unset")
}
case "gomod":
Expand Down Expand Up @@ -386,7 +386,7 @@ func (gf *Finalizer) HandleVendorExperiment() error {

go16 := ver.Major() == 1 && ver.Minor() == 6
if !go16 {
gf.Log.Error(warnings.UnsupportedGO15VENDOREXPERIMENTerror())
gf.Log.Error("%s", warnings.UnsupportedGO15VENDOREXPERIMENTerror())
return errors.New("unsupported GO15VENDOREXPERIMENT")
}

Expand All @@ -413,15 +413,15 @@ func (gf *Finalizer) SetInstallPackages() error {
useVendorDir := gf.VendorExperiment && !gf.Godep.WorkspaceExists

if gf.Godep.WorkspaceExists && vendorDirExists {
gf.Log.Warning(warnings.GodepsWorkspaceWarning())
gf.Log.Warning("%s", warnings.GodepsWorkspaceWarning())
}

if useVendorDir && !vendorDirExists {
gf.Log.Warning("vendor/ directory does not exist.")
}

if len(packages) != 0 {
gf.Log.Warning(warnings.PackageSpecOverride(packages))
gf.Log.Warning("%s", warnings.PackageSpecOverride(packages))
} else if len(gf.Godep.Packages) != 0 {
packages = gf.Godep.Packages
} else {
Expand All @@ -434,7 +434,7 @@ func (gf *Finalizer) SetInstallPackages() error {
}
} else {
if !gf.VendorExperiment && gf.VendorTool == "go_nativevendoring" {
gf.Log.Error(warnings.MustUseVendorError())
gf.Log.Error("%s", warnings.MustUseVendorError())
return errors.New("must use vendor/ for go native vendoring")
}

Expand All @@ -461,7 +461,7 @@ func (gf *Finalizer) CompileApp() error {
cmd = "godep"
}

gf.Log.BeginStep(fmt.Sprintf("Running: %s %s", cmd, strings.Join(args, " ")))
gf.Log.BeginStep("Running: %s %s", cmd, strings.Join(args, " "))

err := gf.Command.Execute(gf.mainPackagePath(), os.Stdout, os.Stderr, cmd, args...)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion src/go/finalize/finalize_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package finalize_test

import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

"testing"
Expand Down
Loading
Loading