From acd9293d47cc2a692be8a970caea5f3e5f963994 Mon Sep 17 00:00:00 2001 From: Jaime Martinez Date: Wed, 9 Jun 2021 11:16:01 +1000 Subject: Improve to-do descriptions --- test/acceptance/serving_test.go | 11 ++--------- test/acceptance/testdata/api_responses.go | 5 +++-- 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'test') diff --git a/test/acceptance/serving_test.go b/test/acceptance/serving_test.go index 9c95f1e0..ba0069b5 100644 --- a/test/acceptance/serving_test.go +++ b/test/acceptance/serving_test.go @@ -200,7 +200,6 @@ func TestCustom404(t *testing.T) { content: "Custom 404 group page", }, { - // TODO: custom domains host: "domain.404.com", content: "Custom domain.404 page", }, @@ -348,7 +347,8 @@ func TestHttpsOnlyGroupEnabled(t *testing.T) { teardown := RunPagesProcess(t, *pagesBinary, supportedListeners(), "") defer teardown() - // TODO: support https too + // TODO: allow configuring HTTPS responses from stub https://gitlab.com/gitlab-org/gitlab-pages/-/issues/571 + // Related MR in progress https://gitlab.com/gitlab-org/gitlab-pages/-/merge_requests/498 rsp, err := GetRedirectPage(t, httpListener, "group.https-only.gitlab-example.com", "project1/") require.NoError(t, err) defer rsp.Body.Close() @@ -358,7 +358,6 @@ func TestHttpsOnlyGroupEnabled(t *testing.T) { func TestHttpsOnlyGroupDisabled(t *testing.T) { skipUnlessEnabled(t) - // TODO: support https too teardown := RunPagesProcess(t, *pagesBinary, supportedListeners(), "") defer teardown() @@ -374,8 +373,6 @@ func TestHttpsOnlyProjectEnabled(t *testing.T) { teardown := RunPagesProcess(t, *pagesBinary, supportedListeners(), "") defer teardown() - // TODO: how to do custom domains :thinking: - // TODO: support https too rsp, err := GetRedirectPage(t, httpListener, "test.my-domain.com", "/index.html") require.NoError(t, err) defer rsp.Body.Close() @@ -388,8 +385,6 @@ func TestHttpsOnlyProjectDisabled(t *testing.T) { teardown := RunPagesProcess(t, *pagesBinary, supportedListeners(), "") defer teardown() - // TODO: how to do custom domains :thinking: - // TODO: support https too rsp, err := GetPageFromListener(t, httpListener, "test2.my-domain.com", "/") require.NoError(t, err) defer rsp.Body.Close() @@ -402,8 +397,6 @@ func TestHttpsOnlyDomainDisabled(t *testing.T) { teardown := RunPagesProcess(t, *pagesBinary, supportedListeners(), "") defer teardown() - // TODO: how to do custom domains :thinking: - // TODO: support https too rsp, err := GetPageFromListener(t, httpListener, "no.cert.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 e7a5a93e..a1c99955 100644 --- a/test/acceptance/testdata/api_responses.go +++ b/test/acceptance/testdata/api_responses.go @@ -140,7 +140,8 @@ func GenerateVirtualDomainFromDir(dir, rootDomain string) responseFn { } lookupPath := api.LookupPath{ - // TODO: find a way to configure this + // TODO: allow configuring response + // Related MR in progress https://gitlab.com/gitlab-org/gitlab-pages/-/merge_requests/498 ProjectID: 123, AccessControl: false, HTTPSOnly: false, @@ -161,7 +162,7 @@ func GenerateVirtualDomainFromDir(dir, rootDomain string) responseFn { } // domain404 hardcoding for now, will implement a better solution in a follow up MR -// TODO: custom domains +//TODO: remove hardcoded custom domains: https://gitlab.com/gitlab-org/gitlab-pages/-/merge_requests/498 func domain404(t *testing.T, wd string) api.VirtualDomain { t.Helper() -- cgit v1.2.3