Merge branch 'remove/ff-enable-redirects' into 'master'

refactor: remove FF_ENABLE_REDIRECTS feature flag

Closes #618

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

1 files changed, 0 insertions, 21 deletions

diff --git a/test/acceptance/redirects_test.go b/test/acceptance/redirects_test.go
index 1ce7a0be..0cadea16 100644
--- a/test/acceptance/redirects_test.go
+++ b/test/acceptance/redirects_test.go
@@ -11,27 +11,6 @@ import (
 	redirects "gitlab.com/gitlab-org/gitlab-pages/internal/redirects"
 )
 
-func TestDisabledRedirects(t *testing.T) {
-	RunPagesProcess(t,
-		withListeners([]ListenSpec{httpListener}),
-		withEnv([]string{"FF_ENABLE_REDIRECTS=false", redirects.FFEnablePlaceholders + "=true"}),
-	)
-
-	// Test that redirects status page is forbidden
-	rsp, err := GetPageFromListener(t, httpListener, "group.redirects.gitlab-example.com", "/project-redirects/_redirects")
-	require.NoError(t, err)
-	defer rsp.Body.Close()
-
-	require.Equal(t, http.StatusForbidden, rsp.StatusCode)
-
-	// Test that redirects are disabled
-	rsp, err = GetRedirectPage(t, httpListener, "group.redirects.gitlab-example.com", "/project-redirects/redirect-portal.html")
-	require.NoError(t, err)
-	defer rsp.Body.Close()
-
-	require.Equal(t, http.StatusNotFound, rsp.StatusCode)
-}
-
 func TestRedirectStatusPage(t *testing.T) {
 	RunPagesProcess(t,
 		withListeners([]ListenSpec{httpListener}),