From 685af284110f55590c0288815bae80cc77cad247 Mon Sep 17 00:00:00 2001 From: Jaime Martinez Date: Tue, 17 Aug 2021 13:58:49 +1000 Subject: test: rename and cleanup some functions --- test/acceptance/auth_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/acceptance/auth_test.go') diff --git a/test/acceptance/auth_test.go b/test/acceptance/auth_test.go index 152030b0..d18c2d77 100644 --- a/test/acceptance/auth_test.go +++ b/test/acceptance/auth_test.go @@ -12,7 +12,7 @@ import ( ) func TestWhenAuthIsDisabledPrivateIsNotAccessible(t *testing.T) { - RunPagesProcessWithStubGitLabServer(t, + RunPagesProcess(t, withListeners([]ListenSpec{httpListener}), ) @@ -104,7 +104,7 @@ func TestWhenLoginCallbackWithUnencryptedCode(t *testing.T) { require.Equal(t, http.StatusInternalServerError, authrsp.StatusCode) } -func TestAccessControlUnderCustomDomainStandalone(t *testing.T) { +func TestAccessControlUnderCustomDomain(t *testing.T) { runPagesWithAuth(t, []ListenSpec{httpListener}) tests := map[string]struct { @@ -500,11 +500,11 @@ func testAccessControl(t *testing.T, runPages runPagesFunc) { } func TestAccessControlWithSSLCertFile(t *testing.T) { - testAccessControl(t, RunPagesProcessWithGitlabServerWithSSLCertFile) + testAccessControl(t, RunPagesProcessWithSSLCertFile) } func TestAccessControlWithSSLCertDir(t *testing.T) { - testAccessControl(t, RunPagesProcessWithGitlabServerWithSSLCertDir) + testAccessControl(t, RunPagesProcessWithSSLCertDir) } // This proves the fix for https://gitlab.com/gitlab-org/gitlab-pages/-/issues/262 @@ -598,7 +598,7 @@ func runPagesWithAuthAndEnv(t *testing.T, listeners []ListenSpec, env []string) "auth-redirect-uri=https://projects.gitlab-example.com/auth", ) - RunPagesProcessWithStubGitLabServer(t, + RunPagesProcess(t, withListeners(listeners), withArguments([]string{ "-config=" + configFile, -- cgit v1.2.3