Skip to content

Commit 1d19279

Browse files
authored
Merge pull request #224 from cloudfoundry/ginkgo-v2
refactor: migrate test suite from Ginkgo v1 to v2
2 parents f9111a2 + e5c793d commit 1d19279

455 files changed

Lines changed: 76616 additions & 2900 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

go.mod

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ go 1.24.12
55
require (
66
github.com/cloudfoundry/libbuildpack v0.0.0-20251202224209-b07cc3dab65e
77
github.com/cloudfoundry/switchblade v0.9.4
8-
github.com/onsi/ginkgo v1.16.5
9-
github.com/onsi/gomega v1.36.2
8+
github.com/onsi/ginkgo/v2 v2.28.1
9+
github.com/onsi/gomega v1.39.0
1010
github.com/sclevine/spec v1.4.0
1111
)
1212

1313
require (
1414
code.cloudfoundry.org/lager v2.0.0+incompatible // indirect
1515
github.com/Masterminds/semver v1.5.0 // indirect
16+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
1617
github.com/Microsoft/go-winio v0.6.2 // indirect
1718
github.com/blang/semver v3.5.1+incompatible // indirect
1819
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@@ -25,18 +26,20 @@ require (
2526
github.com/felixge/httpsnoop v1.0.4 // indirect
2627
github.com/fsnotify/fsnotify v1.8.0 // indirect
2728
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
28-
github.com/go-logr/logr v1.4.2 // indirect
29+
github.com/go-logr/logr v1.4.3 // indirect
2930
github.com/go-logr/stdr v1.2.2 // indirect
31+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3032
github.com/gogo/protobuf v1.3.2 // indirect
31-
github.com/google/go-cmp v0.6.0 // indirect
33+
github.com/google/go-cmp v0.7.0 // indirect
34+
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
3235
github.com/moby/docker-image-spec v1.3.1 // indirect
3336
github.com/nxadm/tail v1.4.11 // indirect
37+
github.com/onsi/ginkgo v1.16.5 // indirect
3438
github.com/opencontainers/go-digest v1.0.0 // indirect
3539
github.com/opencontainers/image-spec v1.1.0 // indirect
3640
github.com/paketo-buildpacks/packit v1.3.1 // indirect
3741
github.com/paketo-buildpacks/packit/v2 v2.16.0 // indirect
3842
github.com/pkg/errors v0.9.1 // indirect
39-
github.com/rogpeppe/go-internal v1.13.1 // indirect
4043
github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 // indirect
4144
github.com/tidwall/gjson v1.18.0 // indirect
4245
github.com/tidwall/match v1.1.1 // indirect
@@ -48,14 +51,17 @@ require (
4851
go.opentelemetry.io/otel/metric v1.32.0 // indirect
4952
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
5053
go.opentelemetry.io/otel/trace v1.32.0 // indirect
51-
golang.org/x/net v0.34.0 // indirect
52-
golang.org/x/sys v0.29.0 // indirect
53-
golang.org/x/text v0.21.0 // indirect
54+
go.yaml.in/yaml/v3 v3.0.4 // indirect
55+
golang.org/x/mod v0.32.0 // indirect
56+
golang.org/x/net v0.49.0 // indirect
57+
golang.org/x/sync v0.19.0 // indirect
58+
golang.org/x/sys v0.40.0 // indirect
59+
golang.org/x/text v0.33.0 // indirect
60+
golang.org/x/tools v0.41.0 // indirect
5461
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
5562
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
5663
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
5764
gopkg.in/yaml.v2 v2.4.0 // indirect
58-
gopkg.in/yaml.v3 v3.0.1 // indirect
5965
)
6066

6167
exclude google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd

go.sum

Lines changed: 44 additions & 20 deletions
Large diffs are not rendered by default.

src/binary/brats/brats_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/cloudfoundry/libbuildpack/bratshelper"
1212
"github.com/cloudfoundry/libbuildpack/cutlass"
1313

14-
. "github.com/onsi/ginkgo"
14+
. "github.com/onsi/ginkgo/v2"
1515
. "github.com/onsi/gomega"
1616
)
1717

src/binary/brats/brats_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package brats_test
33
import (
44
"github.com/cloudfoundry/libbuildpack/bratshelper"
55
"github.com/cloudfoundry/libbuildpack/cutlass"
6-
. "github.com/onsi/ginkgo"
6+
. "github.com/onsi/ginkgo/v2"
77
)
88

99
var _ = Describe("Binary buildpack", func() {

src/binary/finalize/cli/cli_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

src/binary/finalize/finalize_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package finalize_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

src/binary/supply/cli/cli_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

src/binary/supply/supply_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package supply_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

vendor/github.com/Masterminds/semver/v3/.gitignore

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Masterminds/semver/v3/.golangci.yml

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)