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:
Diffstat (limited to 'test/acceptance/serving_test.go')
-rw-r--r--test/acceptance/serving_test.go16
1 files changed, 9 insertions, 7 deletions
diff --git a/test/acceptance/serving_test.go b/test/acceptance/serving_test.go
index 410e5ca0..00289c58 100644
--- a/test/acceptance/serving_test.go
+++ b/test/acceptance/serving_test.go
@@ -486,11 +486,14 @@ func TestServerRepliesWithHeaders(t *testing.T) {
}
for name, test := range tests {
- testFn := func(envArgs, headerArgs []string) func(*testing.T) {
+ testFn := func(headerEnv string, headerArgs []string) func(*testing.T) {
return func(t *testing.T) {
+ if headerEnv != "" {
+ t.Setenv("HEADER", headerEnv)
+ }
+
RunPagesProcess(t,
withListeners([]ListenSpec{httpListener}),
- withEnv(envArgs),
withArguments(headerArgs),
)
@@ -509,7 +512,7 @@ func TestServerRepliesWithHeaders(t *testing.T) {
t.Run(name+"/from_single_flag", func(t *testing.T) {
args := []string{"-header", strings.Join(test.flags, ";;")}
- testFn([]string{}, args)
+ testFn("", args)
})
t.Run(name+"/from_multiple_flags", func(t *testing.T) {
@@ -518,18 +521,17 @@ func TestServerRepliesWithHeaders(t *testing.T) {
args = append(args, "-header", arg)
}
- testFn([]string{}, args)
+ testFn("", args)
})
t.Run(name+"/from_config_file", func(t *testing.T) {
file := newConfigFile(t, "-header="+strings.Join(test.flags, ";;"))
- testFn([]string{}, []string{"-config", file})
+ testFn("", []string{"-config", file})
})
t.Run(name+"/from_env", func(t *testing.T) {
- args := []string{"header", strings.Join(test.flags, ";;")}
- testFn(args, []string{})
+ testFn(strings.Join(test.flags, ";;"), []string{})
})
}
}