diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2021-07-19 08:43:31 +0300 |
|---|---|---|
| committer | Jaime Martinez <jmartinez@gitlab.com> | 2021-07-19 08:43:31 +0300 |
| commit | 224b20ad8bcb8bd3b8d067588524677aee9b4894 (patch) | |
| tree | afc507778cfee8dd92bc309dc4c2bea2b2be9c31 /test | |
| parent | 429eeb352afac7b28f7486bfbd1af816cdaeac61 (diff) | |
Add test2.my-domain.com config
Diffstat (limited to 'test')
| -rw-r--r-- | test/acceptance/serving_test.go | 6 | ||||
| -rw-r--r-- | test/acceptance/testdata/api_responses.go | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/test/acceptance/serving_test.go b/test/acceptance/serving_test.go index 5ce57788..23df429d 100644 --- a/test/acceptance/serving_test.go +++ b/test/acceptance/serving_test.go @@ -351,9 +351,9 @@ func TestHttpsOnlyProjectEnabled(t *testing.T) { } func TestHttpsOnlyProjectDisabled(t *testing.T) { - teardown := RunPagesProcess(t, *pagesBinary, supportedListeners(), "") - defer teardown() - + RunPagesProcessWithStubGitLabServer(t, + withListeners([]ListenSpec{httpListener}), + ) rsp, err := GetPageFromListener(t, httpListener, "test2.my-domain.com", "/") require.NoError(t, err) defer rsp.Body.Close() diff --git a/test/acceptance/testdata/api_responses.go b/test/acceptance/testdata/api_responses.go index 9e6eb938..2d05b344 100644 --- a/test/acceptance/testdata/api_responses.go +++ b/test/acceptance/testdata/api_responses.go @@ -56,6 +56,11 @@ var DomainResponses = map[string]responseFn{ https: true, pathOnDisk: "group.https-only/project3", }), + "test2.my-domain.com": customDomain(projectConfig{ + projectID: 1002, + https: false, + pathOnDisk: "group.https-only/project4", + }), // NOTE: before adding more domains here, generate the zip archive by running (per project) // make zip PROJECT_SUBDIR=group/serving // make zip PROJECT_SUBDIR=group/project2 |