Skip to content

feat: hooks round 4 - update tests to use require package #2030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2025
Merged

feat: hooks round 4 - update tests to use require package #2030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 7 additions & 22 deletions internal/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,8 @@ func TestUtils(t *testing.T) {
configPath = "abc"

globalCfg, err := Config()
if err == nil {
t.Fatal("exp non-nil err")
}
if globalCfg != nil {
t.Fatal("exp nil conn")
}
require.Error(t, err)
require.Nil(t, globalCfg)
}
}()

Expand All @@ -49,9 +45,7 @@ func TestUtils(t *testing.T) {
{
globalCfg := Must(Config())
conn := Must(Conn(globalCfg))
if conn == nil {
t.Fatal("exp non-nil conn")
}
require.NotNil(t, conn)
}

// negative
Expand All @@ -60,12 +54,8 @@ func TestUtils(t *testing.T) {
globalCfg.DB.Driver = ""
globalCfg.DB.URL = "invalid"
conn, err := Conn(globalCfg)
if err == nil {
t.Fatal("exp non-nil err")
}
if conn != nil {
t.Fatal("exp nil conn")
}
require.Error(t, err)
require.Nil(t, conn)
}

}()
Expand All @@ -89,10 +79,7 @@ func TestUtils(t *testing.T) {
panic(errors.New("globalCfg != nil"))
}
}()

if err == nil {
t.Fatal("exp non-nil err")
}
require.Error(t, err)
}()

// block init from main()
Expand All @@ -113,8 +100,6 @@ func TestUtils(t *testing.T) {
}()

exp := "package e2e may not be used in a main package"
if errStr != exp {
t.Fatalf("exp %v; got %v", exp, errStr)
}
require.Equal(t, exp, errStr)
}()
}
72 changes: 21 additions & 51 deletions internal/e2e/e2ehooks/e2ehooks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,44 +9,32 @@ import (
"testing/iotest"
"time"

"github.com/stretchr/testify/require"
"github.com/supabase/auth/internal/conf"
"github.com/supabase/auth/internal/hooks/v0hooks"
)

func TestInstance(t *testing.T) {
{
globalCfg, err := conf.LoadGlobal("../../../hack/test.env")
if err != nil {
t.Fatalf("exp nil err; got %v", err)
}
require.NoError(t, err)

globalCfg.DB.Driver = ""
globalCfg.DB.URL = "invalid"

inst, err := New(globalCfg)
if err == nil {
t.Fatal("exp non-nil err")
}
if inst != nil {
t.Fatal("exp nil *Instance")
}
require.Error(t, err)
require.Nil(t, inst)
}

{
globalCfg, err := conf.LoadGlobal("../../../hack/test.env")
if err != nil {
t.Fatalf("exp nil err; got %v", err)
}
require.NoError(t, err)

inst, err := New(globalCfg)
if err != nil {
t.Fatalf("exp nil err; got %v", err)
}
if inst == nil {
t.Fatal("exp non-nil *Instance")
}
if err := inst.Close(); err != nil {
t.Fatalf("exp nil err from Close; got %v", err)
}
require.NoError(t, err)
require.NotNil(t, inst)
require.NoError(t, inst.Close())
}
}

Expand All @@ -58,9 +46,7 @@ func TestHook(t *testing.T) {

{
calls := hook.GetCalls()
if exp, got := 0, len(calls); exp != got {
t.Fatalf("exp %v; got %v", exp, got)
}
require.Equal(t, 0, len(calls))

u := "http://localhost"
rdr := strings.NewReader("12345")
Expand All @@ -70,18 +56,13 @@ func TestHook(t *testing.T) {
hook.ServeHTTP(res, req)

calls = hook.GetCalls()
if exp, got := 1, len(calls); exp != got {
t.Fatalf("exp %v; got %v", exp, got)
}
require.Equal(t, 1, len(calls))
call := calls[0]

var got int
if err := call.Unmarshal(&got); err != nil {
t.Fatalf("exp nil err; got %v", err)
}
if exp := 12345; exp != got {
t.Fatalf("exp %v; got %v", exp, got)
}
err := call.Unmarshal(&got)
require.NoError(t, err)
require.Equal(t, 12345, got)
}

{
Expand Down Expand Up @@ -138,9 +119,7 @@ func TestHookRecorder(t *testing.T) {

{
calls := test.hook.GetCalls()
if exp, got := 0, len(calls); exp != got {
t.Fatalf("exp %v; got %v", exp, got)
}
require.Equal(t, 0, len(calls))
}

u := "http://localhost/hooks/" + string(test.name)
Expand All @@ -151,23 +130,16 @@ func TestHookRecorder(t *testing.T) {

{
calls := test.hook.GetCalls()
if exp, got := 1, len(calls); exp != got {
t.Fatalf("exp %v; got %v", exp, got)
}
require.Equal(t, 1, len(calls))
call := calls[0]

test.hook.ClearCalls()
if exp, got := 0, len(test.hook.GetCalls()); exp != got {
t.Fatalf("exp %v; got %v", exp, got)
}
require.Equal(t, 0, len(test.hook.GetCalls()))

var got int
if err := call.Unmarshal(&got); err != nil {
t.Fatalf("exp nil err; got %v", err)
}
if exp := 12345; exp != got {
t.Fatalf("exp %v; got %v", exp, got)
}
err := call.Unmarshal(&got)
require.NoError(t, err)
require.Equal(t, 12345, got)
}
}

Expand All @@ -179,8 +151,6 @@ func TestHookRecorder(t *testing.T) {
res := httptest.NewRecorder()
hookRec.ServeHTTP(res, req)

if exp, got := 404, res.Result().StatusCode; exp != got {
t.Fatalf("exp %v; got %v", exp, got)
}
require.Equal(t, 404, res.Result().StatusCode)
}
}
Loading
Loading