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
diff options
context:
space:
mode:
authorRob Watson <rob@mixlr.com>2018-01-03 23:02:46 +0300
committerRob Watson <rob@mixlr.com>2018-03-06 21:06:11 +0300
commit00b6c5f315ac00e9da8a6de99c50b064e9f87872 (patch)
tree000051186e3a2e820a25b9e4b3157ba83d9af13f /domain_test.go
parenta638665f6c6eacd6aad74c855f0f6441c09ca029 (diff)
Implement HTTPS-only pages
- Check `config.json` for `httpsonly` attribute - Store value against custom domain or group/project pair - Respond with 301 redirect to HTTP requests to these domains/projects Re: https://gitlab.com/gitlab-org/gitlab-ce/issues/28857
Diffstat (limited to 'domain_test.go')
-rw-r--r--domain_test.go32
1 files changed, 16 insertions, 16 deletions
diff --git a/domain_test.go b/domain_test.go
index 26be21eb..454148ae 100644
--- a/domain_test.go
+++ b/domain_test.go
@@ -18,8 +18,8 @@ func TestGroupServeHTTP(t *testing.T) {
setUpTests()
testGroup := &domain{
- Group: "group",
- Project: "",
+ Group: "group",
+ ProjectName: "",
}
assert.HTTPBodyContains(t, testGroup.ServeHTTP, "GET", "http://group.test.io/", nil, "main-dir")
@@ -48,8 +48,8 @@ func TestDomainServeHTTP(t *testing.T) {
setUpTests()
testDomain := &domain{
- Group: "group",
- Project: "project2",
+ Group: "group",
+ ProjectName: "project2",
Config: &domainConfig{
Domain: "test.domain.com",
},
@@ -95,8 +95,8 @@ func TestGroupServeHTTPGzip(t *testing.T) {
setUpTests()
testGroup := &domain{
- Group: "group",
- Project: "",
+ Group: "group",
+ ProjectName: "",
}
testSet := []struct {
@@ -158,8 +158,8 @@ func TestGroup404ServeHTTP(t *testing.T) {
setUpTests()
testGroup := &domain{
- Group: "group.404",
- Project: "",
+ Group: "group.404",
+ ProjectName: "",
}
testHTTP404(t, testGroup.ServeHTTP, "GET", "http://group.404.test.io/project.404/not/existing-file", nil, "Custom 404 project page")
@@ -175,8 +175,8 @@ func TestDomain404ServeHTTP(t *testing.T) {
setUpTests()
testDomain := &domain{
- Group: "group.404",
- Project: "domain.404",
+ Group: "group.404",
+ ProjectName: "domain.404",
Config: &domainConfig{
Domain: "domain.404.com",
},
@@ -198,8 +198,8 @@ func TestPredefined404ServeHTTP(t *testing.T) {
func TestGroupCertificate(t *testing.T) {
testGroup := &domain{
- Group: "group",
- Project: "",
+ Group: "group",
+ ProjectName: "",
}
tls, err := testGroup.ensureCertificate()
@@ -209,8 +209,8 @@ func TestGroupCertificate(t *testing.T) {
func TestDomainNoCertificate(t *testing.T) {
testDomain := &domain{
- Group: "group",
- Project: "project2",
+ Group: "group",
+ ProjectName: "project2",
Config: &domainConfig{
Domain: "test.domain.com",
},
@@ -227,8 +227,8 @@ func TestDomainNoCertificate(t *testing.T) {
func TestDomainCertificate(t *testing.T) {
testDomain := &domain{
- Group: "group",
- Project: "project2",
+ Group: "group",
+ ProjectName: "project2",
Config: &domainConfig{
Domain: "test.domain.com",
Certificate: CertificateFixture,