Merge branch '571-refactoring-acceptnace-part-3' into 'master'

Remove skipUnlessEnabled(t) from tests

See merge request gitlab-org/gitlab-pages!521

1 files changed, 1 insertions, 6 deletions

diff --git a/test/acceptance/helpers_test.go b/test/acceptance/helpers_test.go
index 472f42d1..ebb498d0 100644
--- a/test/acceptance/helpers_test.go
+++ b/test/acceptance/helpers_test.go
@@ -221,10 +221,6 @@ func RunPagesProcessWithEnvs(t *testing.T, wait bool, pagesBinary string, listen
 	return cleanup
 }
 
-func RunPagesProcessWithOutput(t *testing.T, pagesBinary string, listeners []ListenSpec, promPort string, extraArgs ...string) (out *LogCaptureBuffer, teardown func()) {
-	return runPagesProcess(t, true, pagesBinary, listeners, promPort, nil, extraArgs...)
-}
-
 func RunPagesProcessWithStubGitLabServer(t *testing.T, opts ...processOption) *LogCaptureBuffer {
 	chdir := false
 	chdirCleanup := testhelpers.ChdirInPath(t, "../../shared/pages", &chdir)
@@ -359,13 +355,12 @@ func runPagesProcess(t *testing.T, wait bool, pagesBinary string, listeners []Li
 
 func getPagesArgs(t *testing.T, listeners []ListenSpec, promPort string, extraArgs []string) (args, tempfiles []string) {
 	var hasHTTPS bool
-
 	args = append(args, "-log-verbose=true")
 
 	for _, spec := range listeners {
 		args = append(args, "-listen-"+spec.Type, spec.JoinHostPort())
 
-		if spec.Type == request.SchemeHTTPS {
+		if strings.Contains(spec.Type, request.SchemeHTTPS) {
 			hasHTTPS = true
 		}
 	}