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-10 19:43:20 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-12-10 19:43:20 +0300
commit22a73c6be625c1cdbe676ac3e1bef9985fb47fd9 (patch)
tree02282b0b1277ad6c273093d8133c032cef41478c /acceptance_test.go
parent185d5e494eb32b14f5f9340d8bd5cb8b95657f3f (diff)
parent266b942aba1f98c0548472542cfc6b7cec7a5f17 (diff)
Merge branch 'master' into feature/gb/gitlab-domains-source
* master: Add support for the port component in the Host header Base64 decode GitLab API secret
Diffstat (limited to 'acceptance_test.go')
-rw-r--r--acceptance_test.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/acceptance_test.go b/acceptance_test.go
index af6d86bc..ae1bf2b6 100644
--- a/acceptance_test.go
+++ b/acceptance_test.go
@@ -1535,7 +1535,8 @@ func TestGitlabDomainsSource(t *testing.T) {
defer source.Close()
newSourceDomains := "GITLAB_NEW_SOURCE_DOMAINS=new-source-test.gitlab.io,non-existent-domain.gitlab.io"
- pagesArgs := []string{"-gitlab-server", source.URL, "-api-secret-key", "README.md"}
+ gitLabAPISecretKey := CreateGitLabAPISecretKeyFixtureFile(t)
+ pagesArgs := []string{"-gitlab-server", source.URL, "-api-secret-key", gitLabAPISecretKey}
teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{newSourceDomains}, pagesArgs...)
defer teardown()