Revert "Merge branch 'use-domain-config-source-disk' into 'master'"revert-a3365a7b

This reverts merge request !305

1 files changed, 23 insertions, 4 deletions

diff --git a/acceptance_test.go b/acceptance_test.go
index abcf3592..2b0a7800 100644
--- a/acceptance_test.go
+++ b/acceptance_test.go
@@ -1714,11 +1714,22 @@ func TestGitlabDomainsSource(t *testing.T) {
 	source := NewGitlabDomainsSourceStub(t)
 	defer source.Close()
 
+	gitlabSourceConfig := `
+domains:
+  enabled:
+    - new-source-test.gitlab.io
+  broken: pages-broken-poc.gitlab.io
+`
+	gitlabSourceConfigFile, cleanupGitlabSourceConfigFile := CreateGitlabSourceConfigFixtureFile(t, gitlabSourceConfig)
+	defer cleanupGitlabSourceConfigFile()
+
+	gitlabSourceConfigFile = "GITLAB_SOURCE_CONFIG_FILE=" + gitlabSourceConfigFile
+
 	gitLabAPISecretKey := CreateGitLabAPISecretKeyFixtureFile(t)
 
-	pagesArgs := []string{"-gitlab-server", source.URL, "-api-secret-key", gitLabAPISecretKey, "-domain-config-source", "gitlab"}
+	pagesArgs := []string{"-gitlab-server", source.URL, "-api-secret-key", gitLabAPISecretKey}
 
-	teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{}, pagesArgs...)
+	teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{gitlabSourceConfigFile}, pagesArgs...)
 	defer teardown()
 
 	t.Run("when a domain exists", func(t *testing.T) {
@@ -1726,8 +1737,7 @@ func TestGitlabDomainsSource(t *testing.T) {
 		require.NoError(t, err)
 
 		defer response.Body.Close()
-		body, err := ioutil.ReadAll(response.Body)
-		require.NoError(t, err)
+		body, _ := ioutil.ReadAll(response.Body)
 
 		require.Equal(t, http.StatusOK, response.StatusCode)
 		require.Equal(t, "New Pages GitLab Source TEST OK\n", string(body))
@@ -1740,4 +1750,13 @@ func TestGitlabDomainsSource(t *testing.T) {
 
 		require.Equal(t, http.StatusNotFound, response.StatusCode)
 	})
+
+	t.Run("broken domain is requested", func(t *testing.T) {
+		response, err := GetPageFromListener(t, httpListener, "pages-broken-poc.gitlab.io", "index.html")
+		require.NoError(t, err)
+
+		defer response.Body.Close()
+
+		require.Equal(t, http.StatusBadGateway, response.StatusCode)
+	})
 }