refactor: add Must methods to user http driver

test/driver/user.go

@@ -1,6 +1,7 @@
 package driver
 
 import (
+	"app/test/matchers"
 	"app/test/req"
 	"app/user"
 
@@ -33,6 +34,10 @@ func (d *UserDriver) CreateUser(name string) (user.User, error) {
 	})
 }
 
+func (d *UserDriver) MustCreateUser(name string) user.User {
+	return matchers.Must2(d.CreateUser(name))
+}
+
 func (d *UserDriver) GetUser(name string) (user.User, error) {
 	var u user.User
 
@@ -48,6 +53,10 @@ func (d *UserDriver) GetUser(name string) (user.User, error) {
 	})
 }
 
+func (d *UserDriver) MustGetUser(name string) user.User {
+	return matchers.Must2(d.GetUser(name))
+}
+
 func (d *UserDriver) ListUsers() ([]user.User, error) {
 	var users []user.User
 	return users, makeJSONRequest(params{
@@ -62,6 +71,10 @@ func (d *UserDriver) ListUsers() ([]user.User, error) {
 	})
 }
 
+func (d *UserDriver) MustListUsers() []user.User {
+	return matchers.Must2(d.ListUsers())
+}
+
 func (d *UserDriver) DeleteUser(name string) error {
 	return makeJSONRequest(params{
 		status: http.StatusOK,
@@ -74,6 +87,10 @@ func (d *UserDriver) DeleteUser(name string) error {
 	})
 }
 
+func (d *UserDriver) MustDeleteUser(name string) {
+	matchers.Must(d.DeleteUser(name))
+}
+
 func (d *UserDriver) GetFeature(name string) (map[string]any, error) {
 	var features map[string]any
 
@@ -88,3 +105,7 @@ func (d *UserDriver) GetFeature(name string) (map[string]any, error) {
 		},
 	})
 }
+
+func (d *UserDriver) MustGetFeature(name string) map[string]any {
+	return matchers.Must2(d.GetFeature(name))
+}

user/http/controller_test.go

@@ -13,7 +13,7 @@ import (
 	"app/config"
 	"app/test"
 	"app/test/driver"
-	. "app/test/matchers"
+	"app/test/matchers"
 	"app/user"
 	userhttp "app/user/http"
 	usermodule "app/user/module"
@@ -52,55 +52,55 @@ var _ = Describe("/users", Ordered, func() {
 			validation.Module,
 			postgres.Module,
 			usermodule.Module,
-			fx.Invoke(func(app *fiber.App, controller *userhttp.Controller) {
-				controller.Register(app)
+			fx.Invoke(func(fiberapp *fiber.App, controller *userhttp.Controller) {
+				controller.Register(fiberapp)
 			}),
 			fx.Populate(&app, &userService),
 		).RequireStart()
 	})
 
-	BeforeEach(func() { Must(userService.DeleteAll(context.Background())) })
+	BeforeEach(func() { matchers.Must(userService.DeleteAll(context.Background())) })
 
 	AfterAll(func() { fxApp.RequireStop() })
 
 	It("creates and gets user", func() {
-		bob := Must2(app.User.CreateUser("bob"))
-		found := Must2(app.User.GetUser(bob.Name))
+		bob := app.User.MustCreateUser("bob")
+		found := app.User.MustGetUser(bob.Name)
 
 		Expect(found).To(Equal(bob))
 	})
 
 	It("lists users", func() {
-		bob := Must2(app.User.CreateUser("bob"))
-		dave := Must2(app.User.CreateUser("dave"))
+		bob := app.User.MustCreateUser("bob")
+		dave := app.User.MustCreateUser("dave")
 
-		users := Must2(app.User.ListUsers())
+		users := app.User.MustListUsers()
 		Expect(users).To(Equal([]user.User{bob, dave}))
 	})
 
 	It("deletes users", func() {
-		bob := Must2(app.User.CreateUser("bob"))
-		dave := Must2(app.User.CreateUser("dave"))
+		bob := app.User.MustCreateUser("bob")
+		dave := app.User.MustCreateUser("dave")
 
-		Must(app.User.DeleteUser(dave.Name))
+		app.User.MustDeleteUser(dave.Name)
 
 		_, err := app.User.GetUser(dave.Name)
 		Expect(err).To(Equal(driver.RequestFailure{
 			Status: http.StatusNotFound,
 			Body:   "Not Found",
 		}))
 
-		users := Must2(app.User.ListUsers())
+		users := app.User.MustListUsers()
 		Expect(users).To(Equal([]user.User{bob}))
 	})
 
 	It("switches feature flag", func() {
-		bob := Must2(app.User.CreateUser("bob"))
-		bobFeatures := Must2(app.User.GetFeature(bob.Name))
+		bob := app.User.MustCreateUser("bob")
+		bobFeatures := app.User.MustGetFeature(bob.Name)
 		Expect(bobFeatures).To(Equal(map[string]any{"cool-feature": "on"}))
 
-		frank := Must2(app.User.CreateUser("frank"))
-		frankFeatures := Must2(app.User.GetFeature(frank.Name))
+		frank := app.User.MustCreateUser("frank")
+		frankFeatures := app.User.MustGetFeature(frank.Name)
 		Expect(frankFeatures).To(Equal(map[string]any{"cool-feature": "off"}))
 	})
 })