fix: didPanic should detect panic(nil)

This is cheery-picked from stretchr/testify#793.

Signed-off-by: tison <wander4096@gmail.com>
Co-authored-by: RmbRT <steffen.rattay@gmail.com>

assertions.go

@@ -945,25 +945,21 @@ func (a *Assertions) Condition(comp Comparison, msgAndArgs ...any) bool {
 type PanicTestFunc func()
 
 // didPanic returns true if the function passed to it panics. Otherwise, it returns false.
-func didPanic(f PanicTestFunc) (bool, any, string) {
-	didPanic := false
-	var message any
-	var stack string
-	func() {
-
-		defer func() {
-			if message = recover(); message != nil {
-				didPanic = true
-				stack = string(debug.Stack())
-			}
-		}()
-
-		// call the target function
-		f()
+func didPanic(f PanicTestFunc) (didPanic bool, message any, stack string) {
+	didPanic = true
 
+	defer func() {
+		message = recover()
+		if didPanic {
+			stack = string(debug.Stack())
+		}
 	}()
 
-	return didPanic, message, stack
+	// call the target function
+	f()
+	didPanic = false
+
+	return
 }
 
 // Panics asserts that the code inside the specified PanicTestFunc panics.

assertions_test.go

@@ -912,9 +912,15 @@ func TestCondition(t *testing.T) {
 }
 
 func TestDidPanic(t *testing.T) {
-	if funcDidPanic, _, _ := didPanic(func() {
+	if funcDidPanic, msg, _ := didPanic(func() {
+		panic(nil)
+	}); !funcDidPanic || msg != nil {
+		t.Error("didPanic should return true")
+	}
+
+	if funcDidPanic, msg, _ := didPanic(func() {
 		panic("Panic!")
-	}); !funcDidPanic {
+	}); !funcDidPanic || msg != "Panic!" {
 		t.Error("didPanic should return true")
 	}
 
@@ -943,6 +949,12 @@ func TestPanics(t *testing.T) {
 func TestPanicsWithValue(t *testing.T) {
 	mockAssertion := NewWithOnFailureNoop(new(testing.T))
 
+	if !mockAssertion.PanicsWithValue(nil, func() {
+		panic(nil)
+	}) {
+		t.Error("PanicsWithValue should return true")
+	}
+
 	if !mockAssertion.PanicsWithValue("Panic!", func() {
 		panic("Panic!")
 	}) {