test: use different return handler

ory · Oct 19, 2021 · e489a43 · e489a43
1 parent 3bdb8ab
commit e489a43
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 20 deletions.
diff --git a/selfservice/strategy/password/login_test.go b/selfservice/strategy/password/login_test.go
@@ -47,7 +47,7 @@ func TestCompleteLogin(t *testing.T) {
 
 	errTS := testhelpers.NewErrorTestServer(t, reg)
 	uiTS := testhelpers.NewLoginUIFlowEchoServer(t, reg)
-	redirTS := newReturnTs(t, reg)
+	redirTS := testhelpers.NewRedirSessionEchoTS(t, reg)
 
 	// Overwrite these two:
 	conf.MustSet(config.ViperKeySelfServiceErrorUI, errTS.URL+"/error-ts")

diff --git a/selfservice/strategy/password/strategy_disabled_test.go b/selfservice/strategy/password/strategy_disabled_test.go
@@ -1,10 +1,8 @@
 package password_test
 
 import (
-	"context"
 	"io/ioutil"
 	"net/http"
-	"net/http/httptest"
 	"net/url"
 	"testing"
 
@@ -16,25 +14,8 @@ import (
 	"github.com/ory/kratos/driver/config"
 	"github.com/ory/kratos/identity"
 	"github.com/ory/kratos/internal"
-	"github.com/ory/kratos/session"
-	"github.com/ory/kratos/x"
 )
 
-func newReturnTs(t *testing.T, reg interface {
-	session.ManagementProvider
-	x.WriterProvider
-	config.Provider
-}) *httptest.Server {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		sess, err := reg.SessionManager().FetchFromRequest(r.Context(), r)
-		require.NoError(t, err)
-		reg.Writer().Write(w, r, sess)
-	}))
-	t.Cleanup(ts.Close)
-	reg.Config(context.Background()).MustSet(config.ViperKeySelfServiceBrowserDefaultReturnTo, ts.URL+"/return-ts")
-	return ts
-}
-
 func TestDisabledEndpoint(t *testing.T) {
 	conf, reg := internal.NewFastRegistryWithMocks(t)
 	testhelpers.StrategyEnable(t, conf, identity.CredentialsTypePassword.String(), false)