diff options
| author | Tuomo Ala-Vannesluoma <tuomoav@gmail.com> | 2018-09-10 18:49:17 +0300 |
|---|---|---|
| committer | Tuomo Ala-Vannesluoma <tuomoav@gmail.com> | 2018-09-10 18:49:17 +0300 |
| commit | 551ec02c4a7d0d4da3936f0e1fccf6269ac07921 (patch) | |
| tree | 0c624714314609056dc68cdf03ea68a9dd283e69 /acceptance_test.go | |
| parent | 2ef34395a5106e46009a3261b1c8a8a2a224b032 (diff) | |
Move access controlled projects under a group without default domain project
Diffstat (limited to 'acceptance_test.go')
| -rw-r--r-- | acceptance_test.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/acceptance_test.go b/acceptance_test.go index 23abad5d..19d1c4c9 100644 --- a/acceptance_test.go +++ b/acceptance_test.go @@ -298,7 +298,7 @@ func TestPrometheusMetricsCanBeScraped(t *testing.T) { body, _ := ioutil.ReadAll(resp.Body) assert.Contains(t, string(body), "gitlab_pages_http_sessions_active 0") - assert.Contains(t, string(body), "gitlab_pages_domains_served_total 12") + assert.Contains(t, string(body), "gitlab_pages_domains_served_total 13") } } @@ -581,7 +581,7 @@ func TestWhenAuthIsDisabledPrivateIsNotAccessible(t *testing.T) { teardown := RunPagesProcess(t, *pagesBinary, listeners, "", "") defer teardown() - rsp, err := GetPageFromListener(t, httpListener, "group.gitlab-example.com", "private.project/") + rsp, err := GetPageFromListener(t, httpListener, "group.auth.gitlab-example.com", "private.project/") require.NoError(t, err) rsp.Body.Close() @@ -593,7 +593,7 @@ func TestWhenAuthIsEnabledPrivateWillRedirectToAuthorize(t *testing.T) { teardown := RunPagesProcessWithAuth(t, *pagesBinary, listeners, "") defer teardown() - rsp, err := GetRedirectPage(t, httpsListener, "group.gitlab-example.com", "private.project/") + rsp, err := GetRedirectPage(t, httpsListener, "group.auth.gitlab-example.com", "private.project/") require.NoError(t, err) defer rsp.Body.Close() @@ -635,7 +635,7 @@ func TestWhenLoginCallbackWithWrongStateShouldFail(t *testing.T) { teardown := RunPagesProcessWithAuth(t, *pagesBinary, listeners, "") defer teardown() - rsp, err := GetRedirectPage(t, httpsListener, "group.gitlab-example.com", "private.project/") + rsp, err := GetRedirectPage(t, httpsListener, "group.auth.gitlab-example.com", "private.project/") require.NoError(t, err) defer rsp.Body.Close() @@ -654,7 +654,7 @@ func TestWhenLoginCallbackWithCorrectStateWithoutEndpoint(t *testing.T) { teardown := RunPagesProcessWithAuth(t, *pagesBinary, listeners, "") defer teardown() - rsp, err := GetRedirectPage(t, httpsListener, "group.gitlab-example.com", "private.project/") + rsp, err := GetRedirectPage(t, httpsListener, "group.auth.gitlab-example.com", "private.project/") require.NoError(t, err) defer rsp.Body.Close() @@ -807,28 +807,28 @@ func TestAccessControl(t *testing.T) { Description string }{ { - "group.gitlab-example.com", + "group.auth.gitlab-example.com", "/private.project/", http.StatusOK, false, "project with access", }, { - "group.gitlab-example.com", + "group.auth.gitlab-example.com", "/private.project.1/", http.StatusNotFound, // Do not expose project existed false, "project without access", }, { - "group.gitlab-example.com", + "group.auth.gitlab-example.com", "/private.project.2/", http.StatusFound, true, "invalid token test should redirect back", }, { - "group.gitlab-example.com", + "group.auth.gitlab-example.com", "/nonexistent/", http.StatusNotFound, false, |