From a570607d460e7c5f9d49ce38ba7a4e06ae172359 Mon Sep 17 00:00:00 2001 From: aeneasr <3372410+aeneasr@users.noreply.github.com> Date: Wed, 12 Jan 2022 15:04:02 +0100 Subject: [PATCH] fix: expose network wrapper --- persistence/sql/persister_test.go | 11 +++-------- persistence/sql/testhelpers/network.go | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 persistence/sql/testhelpers/network.go diff --git a/persistence/sql/persister_test.go b/persistence/sql/persister_test.go index 9b5d7a4c1562..c16754356f8a 100644 --- a/persistence/sql/persister_test.go +++ b/persistence/sql/persister_test.go @@ -9,8 +9,6 @@ import ( "sync" "testing" - db "github.com/gofrs/uuid" - "github.com/ory/kratos/x/xsql" "github.com/go-errors/errors" @@ -29,6 +27,7 @@ import ( "github.com/ory/kratos/internal" "github.com/ory/kratos/internal/testhelpers" "github.com/ory/kratos/persistence/sql" + sqltesthelpers "github.com/ory/kratos/persistence/sql/testhelpers" errorx "github.com/ory/kratos/selfservice/errorx/test" lf "github.com/ory/kratos/selfservice/flow/login" login "github.com/ory/kratos/selfservice/flow/login/test" @@ -181,12 +180,8 @@ func TestPersister(t *testing.T) { }) t.Run("contract=courier.TestPersister", func(t *testing.T) { pop.SetLogger(pl(t)) - courier.TestPersister(ctx, - func() (db.UUID, courier.PersisterWrapper) { - return testhelpers.NewNetworkUnlessExisting(t, ctx, p) - }, func() (db.UUID, courier.PersisterWrapper) { - return testhelpers.NewNetwork(t, ctx, p) - })(t) + upsert, insert := sqltesthelpers.DefaultNetworkWrapper(t, ctx, p) + courier.TestPersister(ctx, upsert, insert)(t) }) t.Run("contract=verification.TestPersister", func(t *testing.T) { pop.SetLogger(pl(t)) diff --git a/persistence/sql/testhelpers/network.go b/persistence/sql/testhelpers/network.go new file mode 100644 index 000000000000..935a9d260b31 --- /dev/null +++ b/persistence/sql/testhelpers/network.go @@ -0,0 +1,18 @@ +package testhelpers + +import ( + "context" + db "github.com/gofrs/uuid" + courier "github.com/ory/kratos/courier/test" + "github.com/ory/kratos/internal/testhelpers" + "github.com/ory/kratos/persistence" + "testing" +) + +func DefaultNetworkWrapper(t *testing.T, ctx context.Context, p persistence.Persister) (courier.NetworkWrapper, courier.NetworkWrapper) { + return func() (db.UUID, courier.PersisterWrapper) { + return testhelpers.NewNetworkUnlessExisting(t, ctx, p) + }, func() (db.UUID, courier.PersisterWrapper) { + return testhelpers.NewNetwork(t, ctx, p) + } +}