don't panic on Eventually(nil), fixing #555 (#567)

onsi · Jul 28, 2022 · 9d1186f · 9d1186f
1 parent 8e37808
commit 9d1186f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/internal/async_assertion.go b/internal/async_assertion.go
@@ -40,7 +40,7 @@ func NewAsyncAssertion(asyncType AsyncAssertionType, actualInput interface{}, g
 	}
 
 	switch actualType := reflect.TypeOf(actualInput); {
-	case actualType.Kind() != reflect.Func:
+	case actualInput == nil || actualType.Kind() != reflect.Func:
 		out.actualValue = actualInput
 	case actualType.NumIn() == 0 && actualType.NumOut() > 0:
 		out.actualIsFunc = true

diff --git a/internal/async_assertion_test.go b/internal/async_assertion_test.go
@@ -742,4 +742,22 @@ var _ = Describe("Asynchronous Assertions", func() {
 
 	})
 
+	Context("eventual nil-ism", func() { // issue #555
+
+		It("doesn't panic on nil actual", func() {
+			ig := NewInstrumentedGomega()
+			Expect(func() {
+				ig.G.Eventually(nil).Should(BeNil())
+			}).NotTo(Panic())
+		})
+
+		It("doesn't panic on function returning nil error", func() {
+			ig := NewInstrumentedGomega()
+			Expect(func() {
+				ig.G.Eventually(func() error { return nil }).Should(BeNil())
+			}).NotTo(Panic())
+		})
+
+	})
+
 })