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-11-28 19:03:23 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-11-28 19:03:23 +0300
commit84a6b46d36c5d83bdc41dda596d7f6bcfe4d67f3 (patch)
tree13798b7169640e9185144fce6d6a000d4fda1de5 /acceptance_test.go
parentbd16d63cd84f28c3992f45eef9b57c93b3cc572b (diff)
Use ENV variables to obtain a list of test new source domains
Diffstat (limited to 'acceptance_test.go')
-rw-r--r--acceptance_test.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/acceptance_test.go b/acceptance_test.go
index 5faa0e38..6f2e5fb4 100644
--- a/acceptance_test.go
+++ b/acceptance_test.go
@@ -435,7 +435,9 @@ func TestPageNotAvailableIfNotLoaded(t *testing.T) {
func TestPageNotAvailableInDomainSource(t *testing.T) {
skipUnlessEnabled(t)
- teardown := RunPagesProcessWithoutWait(t, *pagesBinary, listeners, "", "-pages-root=shared/invalid-pages")
+
+ brokenDomain := "GITLAB_NEW_SOURCE_BROKEN_DOMAIN=pages-broken-poc.gitlab.io"
+ teardown := RunPagesProcessWithEnvs(t, false, *pagesBinary, listeners, "", []string{brokenDomain}, "-pages-root=shared/invalid-pages")
defer teardown()
waitForRoundtrips(t, listeners, 5*time.Second)
@@ -1533,7 +1535,8 @@ func TestGitlabDomainsSource(t *testing.T) {
source := NewGitlabDomainsSourceStub(t)
defer source.Close()
- teardown := RunPagesProcess(t, *pagesBinary, listeners, "", "-gitlab-server", source.URL)
+ newSourceDomains := "GITLAB_NEW_SOURCE_DOMAINS=new-source-test.gitlab.io,other-test.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/")