diff --git a/util/update-manifest-releases/go.mod b/util/update-manifest-releases/go.mod index 11e91479..adf6acc2 100644 --- a/util/update-manifest-releases/go.mod +++ b/util/update-manifest-releases/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.5 require ( github.com/onsi/ginkgo/v2 v2.22.0 - github.com/onsi/gomega v1.36.0 + github.com/onsi/gomega v1.36.1 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/util/update-manifest-releases/go.sum b/util/update-manifest-releases/go.sum index 2974eff9..604c40c9 100644 --- a/util/update-manifest-releases/go.sum +++ b/util/update-manifest-releases/go.sum @@ -15,8 +15,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg= github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= -github.com/onsi/gomega v1.36.0 h1:Pb12RlruUtj4XUuPUqeEWc6j5DkVVVA49Uf6YLfC95Y= -github.com/onsi/gomega v1.36.0/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= +github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw= +github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= diff --git a/util/update-manifest-releases/vendor/github.com/onsi/gomega/CHANGELOG.md b/util/update-manifest-releases/vendor/github.com/onsi/gomega/CHANGELOG.md index b797577f..79c3f619 100644 --- a/util/update-manifest-releases/vendor/github.com/onsi/gomega/CHANGELOG.md +++ b/util/update-manifest-releases/vendor/github.com/onsi/gomega/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.36.1 + +### Fixes +- Fix https://github.com/onsi/gomega/issues/803 [1c6c112] +- resolves onsi/gomega#696: make HaveField great on pointer receivers given only a non-addressable value [4feb9d7] + ## 1.36.0 ### Features diff --git a/util/update-manifest-releases/vendor/github.com/onsi/gomega/gomega_dsl.go b/util/update-manifest-releases/vendor/github.com/onsi/gomega/gomega_dsl.go index eb74f6f6..c6ac499f 100644 --- a/util/update-manifest-releases/vendor/github.com/onsi/gomega/gomega_dsl.go +++ b/util/update-manifest-releases/vendor/github.com/onsi/gomega/gomega_dsl.go @@ -22,7 +22,7 @@ import ( "github.com/onsi/gomega/types" ) -const GOMEGA_VERSION = "1.36.0" +const GOMEGA_VERSION = "1.36.1" const nilGomegaPanic = `You are trying to make an assertion, but haven't registered Gomega's fail handler. If you're using Ginkgo then you probably forgot to put your assertion in an It(). diff --git a/util/update-manifest-releases/vendor/github.com/onsi/gomega/matchers/have_field.go b/util/update-manifest-releases/vendor/github.com/onsi/gomega/matchers/have_field.go index 8dd3f871..293457e8 100644 --- a/util/update-manifest-releases/vendor/github.com/onsi/gomega/matchers/have_field.go +++ b/util/update-manifest-releases/vendor/github.com/onsi/gomega/matchers/have_field.go @@ -40,7 +40,12 @@ func extractField(actual interface{}, field string, matchername string) (any, er extractedValue = actualValue.Addr().MethodByName(strings.TrimSuffix(fields[0], "()")) } if extractedValue == (reflect.Value{}) { - return nil, missingFieldError(fmt.Sprintf("%s could not find method named '%s' in struct of type %T.", matchername, fields[0], actual)) + ptr := reflect.New(actualValue.Type()) + ptr.Elem().Set(actualValue) + extractedValue = ptr.MethodByName(strings.TrimSuffix(fields[0], "()")) + if extractedValue == (reflect.Value{}) { + return nil, missingFieldError(fmt.Sprintf("%s could not find method named '%s' in struct of type %T.", matchername, fields[0], actual)) + } } t := extractedValue.Type() if t.NumIn() != 0 || t.NumOut() != 1 { diff --git a/util/update-manifest-releases/vendor/modules.txt b/util/update-manifest-releases/vendor/modules.txt index 58cfe361..192f17fc 100644 --- a/util/update-manifest-releases/vendor/modules.txt +++ b/util/update-manifest-releases/vendor/modules.txt @@ -37,7 +37,7 @@ github.com/onsi/ginkgo/v2/internal/parallel_support github.com/onsi/ginkgo/v2/internal/testingtproxy github.com/onsi/ginkgo/v2/reporters github.com/onsi/ginkgo/v2/types -# github.com/onsi/gomega v1.36.0 +# github.com/onsi/gomega v1.36.1 ## explicit; go 1.22 github.com/onsi/gomega github.com/onsi/gomega/format