Update acceptance tests without gitlabsourceconfig

1 files changed, 9 insertions, 25 deletions

diff --git a/helpers_test.go b/helpers_test.go
index 32bea87c..a55399f4 100644
--- a/helpers_test.go
+++ b/helpers_test.go
@@ -13,7 +13,6 @@ import (
 	"os"
 	"os/exec"
 	"path"
-	"path/filepath"
 	"strings"
 	"testing"
 	"time"
@@ -88,27 +87,6 @@ func CreateGitLabAPISecretKeyFixtureFile(t *testing.T) (filepath string) {
 	return secretfile.Name()
 }
 
-func CreateGitlabSourceConfigFixtureFile(t *testing.T, domains string) (filename string, cleanup func()) {
-	configfile, err := ioutil.TempFile("shared/pages", "gitlab-source-config-*")
-	require.NoError(t, err)
-	configfile.Close()
-
-	cleanup = func() {
-		os.RemoveAll(configfile.Name())
-	}
-
-	require.NoError(t, ioutil.WriteFile(configfile.Name(), []byte(domains), 0644))
-
-	filename, err = filepath.Abs(configfile.Name())
-	require.NoError(t, err)
-
-	if os.Getenv("TEST_DAEMONIZE") != "" {
-		filename = filepath.Base(filename)
-	}
-
-	return filename, cleanup
-}
-
 // ListenSpec is used to point at a gitlab-pages http server, preserving the
 // type of port it is (http, https, proxy)
 type ListenSpec struct {
@@ -443,7 +421,12 @@ func waitForRoundtrips(t *testing.T, listeners []ListenSpec, timeout time.Durati
 }
 
 func NewGitlabDomainsSourceStub(t *testing.T) *httptest.Server {
-	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	mux := http.NewServeMux()
+	mux.HandleFunc("/api/v4/internal/pages/status", func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusNoContent)
+	})
+
+	handler := func(w http.ResponseWriter, r *http.Request) {
 		domain := r.URL.Query().Get("host")
 		path := "shared/lookups/" + domain + ".json"
 
@@ -462,9 +445,10 @@ func NewGitlabDomainsSourceStub(t *testing.T) *httptest.Server {
 		require.NoError(t, err)
 
 		t.Logf("GitLab domain %s source stub served lookup", domain)
-	})
+	}
+	mux.HandleFunc("/api/v4/internal/pages", handler)
 
-	return httptest.NewServer(handler)
+	return httptest.NewServer(mux)
 }
 
 func newConfigFile(configs ...string) (string, error) {