diff options
author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2021-08-06 14:22:43 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-06 14:22:43 +0000 |
commit | 9853b147199b270271f2fa68fdef68bc4027ed33 (patch) | |
tree | ce71c03c58e0d78e7f02eb068db12b7d5d1be9b6 /vendor/github.com/onsi/gomega/matchers/and.go | |
parent | 840981773325499c241d518ffbda06762cfdc759 (diff) | |
parent | 79e4baf4ca5d61a4e9c997f9ec025e46e45e5d9d (diff) | |
download | podman-9853b147199b270271f2fa68fdef68bc4027ed33.tar.gz podman-9853b147199b270271f2fa68fdef68bc4027ed33.tar.bz2 podman-9853b147199b270271f2fa68fdef68bc4027ed33.zip |
Merge pull request #11151 from containers/dependabot/go_modules/github.com/onsi/gomega-1.15.0
Bump github.com/onsi/gomega from 1.14.0 to 1.15.0
Diffstat (limited to 'vendor/github.com/onsi/gomega/matchers/and.go')
-rw-r--r-- | vendor/github.com/onsi/gomega/matchers/and.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vendor/github.com/onsi/gomega/matchers/and.go b/vendor/github.com/onsi/gomega/matchers/and.go index d83a29164..6bd826adc 100644 --- a/vendor/github.com/onsi/gomega/matchers/and.go +++ b/vendor/github.com/onsi/gomega/matchers/and.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/onsi/gomega/format" - "github.com/onsi/gomega/internal/oraclematcher" "github.com/onsi/gomega/types" ) @@ -52,12 +51,12 @@ func (m *AndMatcher) MatchMayChangeInTheFuture(actual interface{}) bool { if m.firstFailedMatcher == nil { // so all matchers succeeded.. Any one of them changing would change the result. for _, matcher := range m.Matchers { - if oraclematcher.MatchMayChangeInTheFuture(matcher, actual) { + if types.MatchMayChangeInTheFuture(matcher, actual) { return true } } return false // none of were going to change } // one of the matchers failed.. it must be able to change in order to affect the result - return oraclematcher.MatchMayChangeInTheFuture(m.firstFailedMatcher, actual) + return types.MatchMayChangeInTheFuture(m.firstFailedMatcher, actual) } |