From 2c2087953d975c8cc9b57f6b7c94cb18a7894170 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 9 Feb 2023 17:30:06 +0000 Subject: [PATCH] Add Integration test for custom domain redirect to another custom domain (#172) address #155 Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/172 --- integration/get_test.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/integration/get_test.go b/integration/get_test.go index 556ac53..6dd57bc 100644 --- a/integration/get_test.go +++ b/integration/get_test.go @@ -89,11 +89,22 @@ func TestCustomDomainRedirects(t *testing.T) { assert.EqualValues(t, http.StatusTemporaryRedirect, resp.StatusCode) assert.EqualValues(t, "text/html; charset=utf-8", resp.Header.Get("Content-Type")) // TODO: custom port is not evaluated (witch does hurt tests & dev env only) + // assert.EqualValues(t, "https://mock-pages.codeberg-test.org:4430/@main/README.md", resp.Header.Get("Location")) assert.EqualValues(t, "https://mock-pages.codeberg-test.org/@main/README.md", resp.Header.Get("Location")) assert.EqualValues(t, `https:/codeberg.org/6543/test_pages-server_custom-mock-domain/src/branch/main/README.md; rel="canonical"; rel="canonical"`, resp.Header.Get("Link")) - // TODO: test redirect from an custom domain to the primary custom domain (www.example.com -> example.com) - // (cover bug https://codeberg.org/Codeberg/pages-server/issues/153) + // test redirect from an custom domain to the primary custom domain (www.example.com -> example.com) + // regression test to https://codeberg.org/Codeberg/pages-server/issues/153 + resp, err = getTestHTTPSClient().Get("https://mock-pages-redirect.codeberg-test.org:4430/README.md") + assert.NoError(t, err) + if !assert.NotNil(t, resp) { + t.FailNow() + } + assert.EqualValues(t, http.StatusTemporaryRedirect, resp.StatusCode) + assert.EqualValues(t, "text/html; charset=utf-8", resp.Header.Get("Content-Type")) + // TODO: custom port is not evaluated (witch does hurt tests & dev env only) + // assert.EqualValues(t, "https://mock-pages.codeberg-test.org:4430/README.md", resp.Header.Get("Location")) + assert.EqualValues(t, "https://mock-pages.codeberg-test.org/README.md", resp.Header.Get("Location")) } func TestGetNotFound(t *testing.T) {