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
path: root/test
diff options
context:
space:
mode:
authorJaime Martinez <jmartinez@gitlab.com>2021-04-13 02:57:43 +0300
committerJaime Martinez <jmartinez@gitlab.com>2021-04-13 04:14:17 +0300
commit1c91673a288e73d4127e441ecf6ccbab544f62c7 (patch)
tree44c0ca9b2e7f0f639989ca702cae3f0049fe7252 /test
parentc10549ed34d7a00ea087aa2076e47620fa980397 (diff)
Handle chrootPath in http_fs
Diffstat (limited to 'test')
-rw-r--r--test/acceptance/zip_test.go20
1 files changed, 4 insertions, 16 deletions
diff --git a/test/acceptance/zip_test.go b/test/acceptance/zip_test.go
index 008ccc4b..91d5df99 100644
--- a/test/acceptance/zip_test.go
+++ b/test/acceptance/zip_test.go
@@ -183,22 +183,10 @@ func TestZipServingFromDisk(t *testing.T) {
expectedContent: "The page you're looking for could not be found",
},
"file_not_allowed_in_path": {
- host: "zip-not-allowed-path.gitlab.io",
- urlSuffix: "/",
- expectedStatusCode: func() int {
- if os.Getenv("TEST_DAEMONIZE") == "inplace" {
- return http.StatusNotFound
- }
-
- return http.StatusInternalServerError
- }(),
- expectedContent: func() string {
- if os.Getenv("TEST_DAEMONIZE") == "inplace" {
- return "The page you're looking for could not be found"
- }
-
- return "Whoops, something went wrong on our end."
- }(),
+ host: "zip-not-allowed-path.gitlab.io",
+ urlSuffix: "/",
+ expectedStatusCode: http.StatusInternalServerError,
+ expectedContent: "Whoops, something went wrong on our end.",
},
}