diff options
Diffstat (limited to 'internal/domain/domain_test.go')
| -rw-r--r-- | internal/domain/domain_test.go | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/internal/domain/domain_test.go b/internal/domain/domain_test.go index 499510a8..d5db33c9 100644 --- a/internal/domain/domain_test.go +++ b/internal/domain/domain_test.go @@ -16,7 +16,7 @@ import ( "gitlab.com/gitlab-org/gitlab-pages/internal/testhelpers" ) -func serveFileOrNotFound(domain *D) http.HandlerFunc { +func serveFileOrNotFound(domain *Domain) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { if !domain.ServeFileHTTP(w, r) { domain.ServeNotFoundHTTP(w, r) @@ -25,7 +25,7 @@ func serveFileOrNotFound(domain *D) http.HandlerFunc { } func testGroupServeHTTPHost(t *testing.T, host string) { - testGroup := &D{ + testGroup := &Domain{ projectName: "", group: group{ name: "group", @@ -79,7 +79,7 @@ func TestDomainServeHTTP(t *testing.T) { cleanup := setUpTests(t) defer cleanup() - testDomain := &D{ + testDomain := &Domain{ group: group{name: "group"}, projectName: "project2", config: &domainConfig{ @@ -101,13 +101,13 @@ func TestDomainServeHTTP(t *testing.T) { func TestIsHTTPSOnly(t *testing.T) { tests := []struct { name string - domain *D + domain *Domain url string expected bool }{ { name: "Custom domain with HTTPS-only enabled", - domain: &D{ + domain: &Domain{ group: group{name: "group"}, projectName: "project", config: &domainConfig{HTTPSOnly: true}, @@ -117,7 +117,7 @@ func TestIsHTTPSOnly(t *testing.T) { }, { name: "Custom domain with HTTPS-only disabled", - domain: &D{ + domain: &Domain{ group: group{name: "group"}, projectName: "project", config: &domainConfig{HTTPSOnly: false}, @@ -127,7 +127,7 @@ func TestIsHTTPSOnly(t *testing.T) { }, { name: "Default group domain with HTTPS-only enabled", - domain: &D{ + domain: &Domain{ projectName: "project", group: group{ name: "group", @@ -139,7 +139,7 @@ func TestIsHTTPSOnly(t *testing.T) { }, { name: "Default group domain with HTTPS-only disabled", - domain: &D{ + domain: &Domain{ projectName: "project", group: group{ name: "group", @@ -151,7 +151,7 @@ func TestIsHTTPSOnly(t *testing.T) { }, { name: "Case-insensitive default group domain with HTTPS-only enabled", - domain: &D{ + domain: &Domain{ projectName: "project", group: group{ name: "group", @@ -163,7 +163,7 @@ func TestIsHTTPSOnly(t *testing.T) { }, { name: "Other group domain with HTTPS-only enabled", - domain: &D{ + domain: &Domain{ projectName: "project", group: group{ name: "group", @@ -175,7 +175,7 @@ func TestIsHTTPSOnly(t *testing.T) { }, { name: "Other group domain with HTTPS-only disabled", - domain: &D{ + domain: &Domain{ projectName: "project", group: group{ name: "group", @@ -187,7 +187,7 @@ func TestIsHTTPSOnly(t *testing.T) { }, { name: "Unknown project", - domain: &D{ + domain: &Domain{ group: group{name: "group"}, projectName: "project", }, @@ -210,13 +210,13 @@ func TestHasAcmeChallenge(t *testing.T) { tests := []struct { name string - domain *D + domain *Domain token string expected bool }{ { name: "Project containing acme challenge", - domain: &D{ + domain: &Domain{ group: group{name: "group.acme"}, projectName: "with.acme.challenge", config: &domainConfig{HTTPSOnly: true}, @@ -226,7 +226,7 @@ func TestHasAcmeChallenge(t *testing.T) { }, { name: "Project containing acme challenge", - domain: &D{ + domain: &Domain{ group: group{name: "group.acme"}, projectName: "with.acme.challenge", config: &domainConfig{HTTPSOnly: true}, @@ -236,7 +236,7 @@ func TestHasAcmeChallenge(t *testing.T) { }, { name: "Project containing another token", - domain: &D{ + domain: &Domain{ group: group{name: "group.acme"}, projectName: "with.acme.challenge", config: &domainConfig{HTTPSOnly: true}, @@ -252,7 +252,7 @@ func TestHasAcmeChallenge(t *testing.T) { }, { name: "Domain without config", - domain: &D{ + domain: &Domain{ group: group{name: "group.acme"}, projectName: "with.acme.challenge", config: nil, @@ -299,7 +299,7 @@ func TestGroupServeHTTPGzip(t *testing.T) { cleanup := setUpTests(t) defer cleanup() - testGroup := &D{ + testGroup := &Domain{ projectName: "", group: group{ name: "group", @@ -366,7 +366,7 @@ func TestGroup404ServeHTTP(t *testing.T) { cleanup := setUpTests(t) defer cleanup() - testGroup := &D{ + testGroup := &Domain{ projectName: "", group: group{ name: "group.404", @@ -395,7 +395,7 @@ func TestDomain404ServeHTTP(t *testing.T) { cleanup := setUpTests(t) defer cleanup() - testDomain := &D{ + testDomain := &Domain{ group: group{name: "group.404"}, projectName: "domain.404", config: &domainConfig{ @@ -411,7 +411,7 @@ func TestPredefined404ServeHTTP(t *testing.T) { cleanup := setUpTests(t) defer cleanup() - testDomain := &D{ + testDomain := &Domain{ group: group{name: "group"}, } @@ -419,7 +419,7 @@ func TestPredefined404ServeHTTP(t *testing.T) { } func TestGroupCertificate(t *testing.T) { - testGroup := &D{ + testGroup := &Domain{ group: group{name: "group"}, projectName: "", } @@ -430,7 +430,7 @@ func TestGroupCertificate(t *testing.T) { } func TestDomainNoCertificate(t *testing.T) { - testDomain := &D{ + testDomain := &Domain{ group: group{name: "group"}, projectName: "project2", config: &domainConfig{ @@ -448,7 +448,7 @@ func TestDomainNoCertificate(t *testing.T) { } func TestDomainCertificate(t *testing.T) { - testDomain := &D{ + testDomain := &Domain{ group: group{name: "group"}, projectName: "project2", config: &domainConfig{ @@ -467,7 +467,7 @@ func TestCacheControlHeaders(t *testing.T) { cleanup := setUpTests(t) defer cleanup() - testGroup := &D{ + testGroup := &Domain{ group: group{ name: "group", projects: map[string]*project{ |