test: Extract general http request recorder

stroiman · stroiman · commit 41973b3d7b19 · 2025-04-11T13:21:09.000+02:00
This is a common pattern for testing in particular form submission
diff --git a/html/html_form_element_checkbox_test.go b/html/html_form_element_checkbox_test.go
@@ -1,10 +1,10 @@
 package html_test
 
 import (
-	"net/http"
 	"testing"
 
 	"github.com/gost-dom/browser/html"
+	"github.com/gost-dom/browser/internal/testing/gosttest"
 	"github.com/gost-dom/browser/internal/testing/htmltest"
 	"github.com/stretchr/testify/suite"
 )
@@ -17,29 +17,8 @@ func TestHTMLFormElementWithCheckbox(t *testing.T) {
 	suite.Run(t, new(HTMLFormElementWithCheckboxTestSuite))
 }
 
-// httpRequestRecorder is a very simple http.Handler that just records the
-// incoming requests, and returns a 200 status
-type httpRequestRecorder struct {
-	t        testing.TB
-	requests []*http.Request
-}
-
-func (rec *httpRequestRecorder) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	r.ParseForm()
-	rec.requests = append(rec.requests, r)
-}
-
-// Single asserts that a single request was made
-func (r httpRequestRecorder) Single() *http.Request {
-	r.t.Helper()
-	if len(r.requests) != 1 {
-		r.t.Errorf("Expected single recorded request. Got: %d", len(r.requests))
-	}
-	return r.requests[0]
-}
-
 func (s *HTMLFormElementWithCheckboxTestSuite) TestSubmitWithCheckboxes() {
-	rec := &httpRequestRecorder{t: s.T()}
+	rec := &gosttest.HttpRequestFormRecorder{T: s.T()}
 	win := htmltest.NewWindowHelper(s.T(), NewWindowFromHandler(rec))
 	win.LoadHTML(`<body>
 		<form method="post">
diff --git a/html/html_form_element_submit_test.go b/html/html_form_element_submit_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/gost-dom/browser/internal/testing/eventtest"
 	"github.com/gost-dom/browser/internal/testing/fixtures"
 	. "github.com/gost-dom/browser/internal/testing/gomega-matchers"
+	"github.com/gost-dom/browser/internal/testing/gosttest"
 	"github.com/gost-dom/browser/internal/testing/htmltest"
 	. "github.com/gost-dom/browser/testing/gomega-matchers"
 	"github.com/gost-dom/fixture"
@@ -297,26 +298,19 @@ func TestHTMLFormElementSubmitInputWithClickResetButton(t *testing.T) {
 }
 
 func TestResubmitFormOn307Redirects(t *testing.T) {
-	var (
-		actualRequest *http.Request
-		submittedForm url.Values
-	)
-
 	w, setup := fixture.Init(t, &HTMLFormSubmitInputFixture{})
 	w.BaseLocation = "http://example.com/forms"
 	setup.Setup()
 
+	rec := &gosttest.HttpRequestFormRecorder{T: t}
 	w.Handle("POST /form-destination", http.RedirectHandler("/form-redirected", 307))
-	w.HandleFunc("POST /form-redirected", func(w http.ResponseWriter, r *http.Request) {
-		r.ParseForm()
-		actualRequest = r
-		submittedForm = r.Form
-	})
+	w.Handle("POST /form-redirected", rec)
 
 	form := w.Form()
 	form.SetMethod("post")
 	form.SetAction("/form-destination")
 	form.Submit()
-	w.Assert().NotNil(actualRequest, "Request sent to the redirected location")
-	w.Assert().Equal([]string{"bar"}, submittedForm["foo"], "Form on second request")
+
+	w.Assert().Equal(1, len(rec.Requests), "Request sent to the redirected location")
+	w.Assert().Equal([]string{"bar"}, rec.Single().PostForm["foo"])
 }
diff --git a/html/html_input_element_test.go b/html/html_input_element_test.go
@@ -26,9 +26,10 @@ func (s *HTMLInputElementTestSuite) TestDefaultValue() {
 func (s *HTMLInputElementTestSuite) TestClickCheckbox() {
 	e := html.NewHTMLInputElement(nil)
 	e.SetType("checkbox")
-	s.Assert().False(e.Checked())
+	s.Assert().False(e.Checked(), "Checkbox should be false by default")
+
 	e.Click()
-	s.Assert().True(e.Checked())
+	s.Assert().True(e.Checked(), "Checkbox should be true when clicked")
 
 	e.AddEventListener("click", eventtest.PreventDefaultHandler())
 	e.Click()
diff --git a/internal/testing/gosttest/http_request_recorder.go b/internal/testing/gosttest/http_request_recorder.go
@@ -0,0 +1,30 @@
+package gosttest
+
+import (
+	"net/http"
+	"testing"
+)
+
+// HttpRequestFormRecorder is a very simple http.Handler that just records the
+// incoming requests, and returns a 200 status.
+//
+// The recorder automatically calls [http/Request.ParseForm] to make form data
+// availeble.
+type HttpRequestFormRecorder struct {
+	T        testing.TB
+	Requests []*http.Request
+}
+
+func (rec *HttpRequestFormRecorder) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	r.ParseForm()
+	rec.Requests = append(rec.Requests, r)
+}
+
+// Single asserts that a single request was made
+func (r HttpRequestFormRecorder) Single() *http.Request {
+	r.T.Helper()
+	if len(r.Requests) != 1 {
+		r.T.Errorf("Expected single recorded request. Got: %d", len(r.Requests))
+	}
+	return r.Requests[0]
+}
