Skip to content

Commit

Permalink
Ginkgo V2 and dependencies upgrade (#78)
Browse files Browse the repository at this point in the history
* add missing feature data

* changes for ginkgo v2 conversion

* update dependencies based upon develop branch

* upgraded testkit to v2

* upgrade testkit to work with genesis v2 or v3
  • Loading branch information
norman-abramovitz authored Jun 25, 2024
1 parent 4a9cdb0 commit 5d24ea4
Show file tree
Hide file tree
Showing 10 changed files with 137 additions and 228 deletions.
45 changes: 41 additions & 4 deletions spec/go.mod
Original file line number Diff line number Diff line change
@@ -1,9 +1,46 @@
module github.com/genesis-community/concourse-genesis-kit/spec

go 1.14
// replace github.com/genesis-community/testkit => ../../testkit

go 1.22

require (
github.com/genesis-community/testkit/v2 v2.0.2
github.com/onsi/ginkgo/v2 v2.17.3
github.com/onsi/gomega v1.33.1
)

require (
github.com/genesis-community/testkit v0.0.0-20200820133735-febec5cc89d0
github.com/onsi/ginkgo v1.14.0
github.com/onsi/gomega v1.10.1
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/egymgmbh/go-prefix-writer v0.0.0-20180609083313-7326ea162eca // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gonvenience/bunt v1.3.5 // indirect
github.com/gonvenience/neat v1.3.13 // indirect
github.com/gonvenience/term v1.0.2 // indirect
github.com/gonvenience/text v1.0.7 // indirect
github.com/gonvenience/wrap v1.2.0 // indirect
github.com/gonvenience/ytbx v1.4.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20240509144519-723abb6459b7 // indirect
github.com/homeport/dyff v1.7.1 // indirect
github.com/itchyny/gojq v0.12.15 // indirect
github.com/itchyny/timefmt-go v0.1.5 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-ciede2000 v0.0.0-20170301095244-782e8c62fec3 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/mitchellh/hashstructure v1.1.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/tools v0.21.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
298 changes: 82 additions & 216 deletions spec/go.sum

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions spec/results/full-all-params.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
exodus:
bosh: full-all-params
external_url: https://concourse.testing.examle
features: full,no-tls,github-oauth,vault,vault-approle,shout,prometheus
is_director: false
main_target: full-all-params
mode: full
Expand Down
1 change: 1 addition & 0 deletions spec/results/full-no-tls.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
exodus:
bosh: full-no-tls
external_url: https://concourse.testing.examle
features: full,no-tls
is_director: false
main_target: full-no-tls
mode: full
Expand Down
1 change: 1 addition & 0 deletions spec/results/full-self-signed-cert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ exodus:
atc_ca_cert: <!{meta.vault}/ssl/ca:certificate!>
bosh: full-self-signed-cert
external_url: https://concourse.testing.examle
features: full,self-signed-cert
is_director: false
main_target: full-self-signed-cert
mode: full
Expand Down
1 change: 1 addition & 0 deletions spec/results/small-footprint-no-tls.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
exodus:
bosh: small-footprint-no-tls
external_url: https://concourse.testing.examle
features: small-footprint,no-tls
is_director: false
mode: small-footprint
password: <!{meta.vault}/webui:password!>
Expand Down
1 change: 1 addition & 0 deletions spec/results/small-footprint-prometheus.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
exodus:
bosh: small-footprint-prometheus
external_url: https://concourse.testing.examle
features: small-footprint,no-tls,prometheus
is_director: false
mode: small-footprint
password: <!{meta.vault}/webui:password!>
Expand Down
1 change: 1 addition & 0 deletions spec/results/small-footprint-self-signed-cert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ exodus:
atc_ca_cert: <!{meta.vault}/ssl/ca:certificate!>
bosh: small-footprint-self-signed-cert
external_url: https://concourse.testing.examle
features: small-footprint,self-signed-cert
is_director: false
mode: small-footprint
password: <!{meta.vault}/webui:password!>
Expand Down
4 changes: 2 additions & 2 deletions spec/spec_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package spec_test
import (
"testing"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)

func TestSpec(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Spec Suite")
RunSpecs(t, "Concourse Genesis Kit Spec Suite")
}
12 changes: 6 additions & 6 deletions spec/spec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import (
"path/filepath"
"runtime"

. "github.com/genesis-community/testkit/testing"
. "github.com/onsi/ginkgo"
. "github.com/genesis-community/testkit/v2/testing"
. "github.com/onsi/ginkgo/v2"
)
var _ = BeforeSuite(func() {
_, filename, _, _ := runtime.Caller(0)
KitDir, _ = filepath.Abs(filepath.Join(filepath.Dir(filename), "../"))
})

var _ = Describe("Concourse Kit", func() {
BeforeSuite(func() {
_, filename, _, _ := runtime.Caller(0)
KitDir, _ = filepath.Abs(filepath.Join(filepath.Dir(filename), "../"))
})

Describe("small-footprint", func() {
Test(Environment{
Expand Down

0 comments on commit 5d24ea4

Please sign in to comment.