Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-12-04 12:56:15 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-12-04 12:58:22 +0300
commit061955ee870d483751cd8cef42e6bd694d98d033 (patch)
treed9761c505628f16b1d572637efe10e09023b50dc /acceptance_test.go
parentc8ce9b3637df9a5493d4febce1b23b1112a0db3c (diff)
Handle non-existent domains properly using 204 status
Diffstat (limited to 'acceptance_test.go')
-rw-r--r--acceptance_test.go25
1 files changed, 17 insertions, 8 deletions
diff --git a/acceptance_test.go b/acceptance_test.go
index 6f2e5fb4..2598f404 100644
--- a/acceptance_test.go
+++ b/acceptance_test.go
@@ -16,7 +16,6 @@ import (
"time"
"github.com/namsral/flag"
- "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -1535,16 +1534,26 @@ func TestGitlabDomainsSource(t *testing.T) {
source := NewGitlabDomainsSourceStub(t)
defer source.Close()
- newSourceDomains := "GITLAB_NEW_SOURCE_DOMAINS=new-source-test.gitlab.io,other-test.gitlab.io"
+ newSourceDomains := "GITLAB_NEW_SOURCE_DOMAINS=new-source-test.gitlab.io,non-existent-domain.gitlab.io"
teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{newSourceDomains}, "-gitlab-server", source.URL)
defer teardown()
- response, err := GetPageFromListener(t, httpListener, "new-source-test.gitlab.io", "/my/pages/project/")
- require.NoError(t, err)
+ t.Run("when a domain exists", func(t *testing.T) {
+ response, err := GetPageFromListener(t, httpListener, "new-source-test.gitlab.io", "/my/pages/project/")
+ require.NoError(t, err)
- defer response.Body.Close()
- body, _ := ioutil.ReadAll(response.Body)
+ defer response.Body.Close()
+ body, _ := ioutil.ReadAll(response.Body)
+
+ require.Equal(t, http.StatusOK, response.StatusCode)
+ require.Equal(t, "New Pages GitLab Source TEST OK\n", string(body))
+ })
- assert.Equal(t, http.StatusOK, response.StatusCode)
- assert.Equal(t, "New Pages GitLab Source TEST OK\n", string(body))
+ t.Run("when a domain does not exists", func(t *testing.T) {
+ response, err := GetPageFromListener(t, httpListener, "non-existent-domain.gitlab.io", "/path")
+ defer response.Body.Close()
+ require.NoError(t, err)
+
+ require.Equal(t, http.StatusNotFound, response.StatusCode)
+ })
}