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:
authorfeistel <6742251-feistel@users.noreply.gitlab.com>2021-06-15 13:09:36 +0300
committerfeistel <6742251-feistel@users.noreply.gitlab.com>2021-07-22 15:23:32 +0300
commit7a9c492b619078aed6f9c3f95cf21640afd63100 (patch)
treeadc5b78be1cc17fba212e3859e7515d29cbb7760 /test/acceptance/helpers_test.go
parentb72ce71418f5474b1e7dc455052a32b12ae67c39 (diff)
Use internal-gitlab-server in auth-related tasks
Update the auth package to use the internal server when fetching access token or checking for authentication. Changelog: changed
Diffstat (limited to 'test/acceptance/helpers_test.go')
-rw-r--r--test/acceptance/helpers_test.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/acceptance/helpers_test.go b/test/acceptance/helpers_test.go
index ebb498d0..2aa7041d 100644
--- a/test/acceptance/helpers_test.go
+++ b/test/acceptance/helpers_test.go
@@ -260,13 +260,14 @@ func RunPagesProcessWithStubGitLabServer(t *testing.T, opts ...processOption) *L
return logBuf
}
-func RunPagesProcessWithAuth(t *testing.T, pagesBinary string, listeners []ListenSpec, promPort string) func() {
+func RunPagesProcessWithAuth(t *testing.T, pagesBinary string, listeners []ListenSpec, internalServer string, publicServer string) func() {
configFile, cleanup := defaultConfigFileWith(t,
- "gitlab-server=https://gitlab-auth.com",
+ "internal-gitlab-server="+internalServer,
+ "gitlab-server="+publicServer,
"auth-redirect-uri=https://projects.gitlab-example.com/auth")
defer cleanup()
- _, cleanup2 := runPagesProcess(t, true, pagesBinary, listeners, promPort, nil,
+ _, cleanup2 := runPagesProcess(t, true, pagesBinary, listeners, "", nil,
"-config="+configFile,
)
return cleanup2