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
path: root/test
diff options
context:
space:
mode:
authorJaime Martinez <jmartinez@gitlab.com>2021-07-19 08:42:20 +0300
committerJaime Martinez <jmartinez@gitlab.com>2021-07-19 08:42:20 +0300
commit429eeb352afac7b28f7486bfbd1af816cdaeac61 (patch)
tree2ac02e7587d2d41bc217c351be96279d47324319 /test
parent29ecc9c59162fa0a1a9eb3f6545d4d36bfa6d51e (diff)
Add test.my-domain.com config
Diffstat (limited to 'test')
-rw-r--r--test/acceptance/serving_test.go7
-rw-r--r--test/acceptance/testdata/api_responses.go5
2 files changed, 9 insertions, 3 deletions
diff --git a/test/acceptance/serving_test.go b/test/acceptance/serving_test.go
index 049396e6..5ce57788 100644
--- a/test/acceptance/serving_test.go
+++ b/test/acceptance/serving_test.go
@@ -106,7 +106,7 @@ func TestKnownHostReturns200(t *testing.T) {
}
}
-// TODO: remove along with https://gitlab.com/gitlab-org/gitlab-pages/-/issues/382
+// TODO: remove along with support for disk configuration https://gitlab.com/gitlab-org/gitlab-pages/-/issues/382
func TestNestedSubgroups(t *testing.T) {
maxNestedSubgroup := 21
@@ -340,8 +340,9 @@ func TestHTTPSRedirect(t *testing.T) {
}
func TestHttpsOnlyProjectEnabled(t *testing.T) {
- teardown := RunPagesProcess(t, *pagesBinary, supportedListeners(), "")
- defer teardown()
+ RunPagesProcessWithStubGitLabServer(t,
+ withListeners([]ListenSpec{httpListener}),
+ )
rsp, err := GetRedirectPage(t, httpListener, "test.my-domain.com", "/index.html")
require.NoError(t, err)
diff --git a/test/acceptance/testdata/api_responses.go b/test/acceptance/testdata/api_responses.go
index 227a72fd..9e6eb938 100644
--- a/test/acceptance/testdata/api_responses.go
+++ b/test/acceptance/testdata/api_responses.go
@@ -51,6 +51,11 @@ var DomainResponses = map[string]responseFn{
projectID: 1001,
pathOnDisk: "group.redirects/custom-domain",
}),
+ "test.my-domain.com": customDomain(projectConfig{
+ projectID: 1002,
+ https: true,
+ pathOnDisk: "group.https-only/project3",
+ }),
// 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