From ecc39b5958d4a51fa701932b98fab0a45f4c1893 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 27 Apr 2022 14:58:46 -0600 Subject: Ginkgo: use HaveField() for better error checking This is a very late followup to my ginkgo-improving work of 2021. It has been stuck since December because it requires gomega 1.17, which we've just enabled. This commit is simply a copy-paste of a command I saved in my TODO list many months ago: sed -i -e 's/Expect(\([^ ]\+\)\.\([a-zA-Z0-9]\+\))\.To(Equal(/Expect(\1).To(HaveField(\"\2\", /' test/e2e/*_test.go Signed-off-by: Ed Santiago --- test/e2e/commit_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/e2e/commit_test.go') diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go index 78b607f1e..1de30e423 100644 --- a/test/e2e/commit_test.go +++ b/test/e2e/commit_test.go @@ -92,7 +92,7 @@ var _ = Describe("Podman commit", func() { check := podmanTest.Podman([]string{"inspect", "foobar.com/test1-image:latest"}) check.WaitWithDefaultTimeout() data := check.InspectImageJSON() - Expect(data[0].Comment).To(Equal("testing-commit")) + Expect(data[0]).To(HaveField("Comment", "testing-commit")) }) It("podman commit container with author", func() { @@ -107,7 +107,7 @@ var _ = Describe("Podman commit", func() { check := podmanTest.Podman([]string{"inspect", "foobar.com/test1-image:latest"}) check.WaitWithDefaultTimeout() data := check.InspectImageJSON() - Expect(data[0].Author).To(Equal("snoopy")) + Expect(data[0]).To(HaveField("Author", "snoopy")) }) It("podman commit container with change flag", func() { @@ -293,7 +293,7 @@ var _ = Describe("Podman commit", func() { check := podmanTest.Podman([]string{"inspect", "foobar.com/test1-image:latest"}) check.WaitWithDefaultTimeout() data := check.InspectImageJSON() - Expect(data[0].ID).To(Equal(string(id))) + Expect(data[0]).To(HaveField("ID", string(id))) }) It("podman commit should not commit secret", func() { -- cgit v1.2.3-54-g00ecf