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:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2017-08-17 20:24:14 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2017-09-08 16:42:59 +0300
commitcdb4ab073c7c4c3a9ef53df4c6f13e6642878395 (patch)
tree290824074f2135278eb610b92a4c16aa30f4b624 /acceptance_test.go
parent740ae0ce780b71c5d669a265f63ddd9095214704 (diff)
Use namsral/flag to support environment vars for config
Diffstat (limited to 'acceptance_test.go')
-rw-r--r--acceptance_test.go23
1 files changed, 22 insertions, 1 deletions
diff --git a/acceptance_test.go b/acceptance_test.go
index 3e575bdf..f71bd85f 100644
--- a/acceptance_test.go
+++ b/acceptance_test.go
@@ -1,7 +1,6 @@
package main
import (
- "flag"
"fmt"
"io/ioutil"
"net/http"
@@ -10,6 +9,7 @@ import (
"testing"
"time"
+ "github.com/namsral/flag"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -304,3 +304,24 @@ func TestProxyRequest(t *testing.T) {
})
}
}
+
+func TestEnvironmentVariablesConfig(t *testing.T) {
+ skipUnlessEnabled(t)
+ os.Setenv("REDIRECT_HTTP", "true")
+ defer func() { os.Unsetenv("REDIRECT_HTTP") }()
+
+ teardown := RunPagesProcess(t, *pagesBinary, listeners, "")
+ defer teardown()
+
+ rsp, err := GetRedirectPage(t, httpListener, "group.gitlab-example.com", "project/")
+ assert.NoError(t, err)
+ defer rsp.Body.Close()
+ assert.Equal(t, http.StatusTemporaryRedirect, rsp.StatusCode)
+ assert.Equal(t, 1, len(rsp.Header["Location"]))
+ assert.Equal(t, "https://group.gitlab-example.com/project/", rsp.Header.Get("Location"))
+
+ rsp, err = GetPageFromListener(t, httpsListener, "group.gitlab-example.com", "project/")
+ assert.NoError(t, err)
+ defer rsp.Body.Close()
+ assert.Equal(t, http.StatusOK, rsp.StatusCode)
+}