From ed3da6a41b4916f4be908a6e62179c937bb638f9 Mon Sep 17 00:00:00 2001 From: George Blue Date: Thu, 15 Jul 2021 10:42:45 +0100 Subject: [PATCH] Revert "Bump github.com/onsi/gomega from 1.13.0 to 1.14.0 (#80)" Because of https://github.com/onsi/gomega/issues/457 This reverts commit f822e176997d3ed89f862d44396bf21b2adc601c. --- go.mod | 2 +- go.sum | 3 +-- integration_tests/command_line_handler_test.go | 9 ++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 7927359..b0de990 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/google/uuid v1.1.1 // indirect github.com/maxbrunsfeld/counterfeiter/v6 v6.4.1 github.com/onsi/ginkgo v1.16.4 - github.com/onsi/gomega v1.14.0 + github.com/onsi/gomega v1.13.0 github.com/pborman/uuid v1.2.0 // indirect github.com/pivotal-cf/brokerapi/v8 v8.1.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index f81f922..3ce3ee7 100644 --- a/go.sum +++ b/go.sum @@ -56,9 +56,8 @@ github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vv github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= +github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= -github.com/onsi/gomega v1.14.0 h1:ep6kpPVwmr/nTbklSx2nrLNSIO62DoYAhnPNIMhK8gI= -github.com/onsi/gomega v1.14.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= diff --git a/integration_tests/command_line_handler_test.go b/integration_tests/command_line_handler_test.go index c349831..395dbe9 100644 --- a/integration_tests/command_line_handler_test.go +++ b/integration_tests/command_line_handler_test.go @@ -199,7 +199,7 @@ var _ = Describe("Command line handler", func() { Expect(exitCode).To(Equal(1)) Expect(stderr.String()).To(MatchRegexp( - `Missing arguments for generate-manifest. Usage: testharness generate-manifest `)) + `Missing arguments for generate-manifest. Usage: testharness-\d* generate-manifest `)) }) It("exits 1 and logs when a generic error occurs", func() { @@ -328,7 +328,7 @@ var _ = Describe("Command line handler", func() { Expect(exitCode).To(Equal(1)) Expect(stderr.String()).To(MatchRegexp( - `Missing arguments for create-binding. Usage: testharness create-binding `, + `Missing arguments for create-binding. Usage: testharness-\d* create-binding `, )) }) @@ -424,9 +424,8 @@ var _ = Describe("Command line handler", func() { exitCode = startPassingCommandAndGetExitCode([]string{"delete-binding", "arg1"}) Expect(exitCode).To(Equal(1)) - Expect(stderr.String()).To(MatchRegexp( - `Missing arguments for delete-binding. Usage: testharness delete-binding `, + `Missing arguments for delete-binding. Usage: testharness-\d* delete-binding `, )) }) @@ -514,7 +513,7 @@ var _ = Describe("Command line handler", func() { Expect(exitCode).To(Equal(1)) Expect(stderr.String()).To(MatchRegexp( - `Missing arguments for dashboard-url. Usage: testharness dashboard-url `, + `Missing arguments for dashboard-url. Usage: testharness-\d* dashboard-url `, )) })