diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2019-12-05 14:49:15 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2019-12-05 14:49:15 +0300 |
| commit | 70634f8693394cca63bfe84d63888992f756ad5a (patch) | |
| tree | 5e8078af69febf318ef6330b6c1aadaf685c6db8 /acceptance_test.go | |
| parent | cafc4369750e608ac4be5b61240e90265fdcb5a5 (diff) | |
| parent | 7f35a7b7c1dde36f695fd7f1627fa77d9d8d2be0 (diff) | |
Merge branch 'master' into feature/gb/gitlab-domains-source
* master:
Check presence of GitLab API secret when building a domains source
Make GitLab API Secret a supported parameter
Improve error reporting in the main package
Check if GitLab API secret has been provided too
Avoid using `testify/assert` in favor of `require`
Test domains source not fully configured
Improve error handing when creating new domains config source
Fix formatting in internal/source/gitlab/client/client_test.go
Conflicts:
acceptance_test.go
internal/source/gitlab/client/client_test.go
Diffstat (limited to 'acceptance_test.go')
| -rw-r--r-- | acceptance_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/acceptance_test.go b/acceptance_test.go index 2598f404..af6d86bc 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" - teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{newSourceDomains}, "-gitlab-server", source.URL) + pagesArgs := []string{"-gitlab-server", source.URL, "-api-secret-key", "README.md"} + teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{newSourceDomains}, pagesArgs...) defer teardown() t.Run("when a domain exists", func(t *testing.T) { |