mirror of
https://github.com/caddyserver/caddy.git
synced 2025-11-04 03:27:23 -05:00
f35a7fa466
* encode: implement prefer setting * encode: minimum_length configurable via caddyfile * encode: configurable content-types which to encode * file_server: support precompressed files * encode: use ReponseMatcher for conditional encoding of content * linting error & documentation of encode.PrecompressedOrder * encode: allow just one response matcher also change the namespace of the encoders back, I accidently changed to precompressed >.> default matchers include a * to match to any charset, that may be appended * rounding of the PR * added integration tests for new caddyfile directives * improved various doc strings (punctuation and typos) * added json tag for file_server precompress order and encode matcher * file_server: add vary header, remove accept-ranges when serving precompressed files * encode: move Suffix implementation to precompressed modules
56 lines
1.5 KiB
Go
56 lines
1.5 KiB
Go
package integration
|
|
|
|
import (
|
|
jsonMod "encoding/json"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"path/filepath"
|
|
"regexp"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/caddyserver/caddy/v2/caddytest"
|
|
)
|
|
|
|
func TestCaddyfileAdaptToJSON(t *testing.T) {
|
|
// load the list of test files from the dir
|
|
files, err := ioutil.ReadDir("./caddyfile_adapt")
|
|
if err != nil {
|
|
t.Errorf("failed to read caddyfile_adapt dir: %s", err)
|
|
}
|
|
|
|
// prep a regexp to fix strings on windows
|
|
winNewlines := regexp.MustCompile(`\r?\n`)
|
|
|
|
for _, f := range files {
|
|
if f.IsDir() {
|
|
continue
|
|
}
|
|
|
|
// read the test file
|
|
filename := f.Name()
|
|
data, err := ioutil.ReadFile("./caddyfile_adapt/" + filename)
|
|
if err != nil {
|
|
t.Errorf("failed to read %s dir: %s", filename, err)
|
|
}
|
|
|
|
// split the Caddyfile (first) and JSON (second) parts
|
|
// (append newline to Caddyfile to match formatter expectations)
|
|
parts := strings.Split(string(data), "----------")
|
|
caddyfile, json := strings.TrimSpace(parts[0])+"\n", strings.TrimSpace(parts[1])
|
|
|
|
// replace windows newlines in the json with unix newlines
|
|
json = winNewlines.ReplaceAllString(json, "\n")
|
|
|
|
// replace os-specific default path for file_server's hide field
|
|
replacePath, _ := jsonMod.Marshal(fmt.Sprint(".", string(filepath.Separator), "Caddyfile"))
|
|
json = strings.ReplaceAll(json, `"./Caddyfile"`, string(replacePath))
|
|
|
|
// run the test
|
|
ok := caddytest.CompareAdapt(t, filename, caddyfile, "caddyfile", json)
|
|
if !ok {
|
|
t.Errorf("failed to adapt %s", filename)
|
|
}
|
|
}
|
|
}
|