diff options
author | Matthew Holt <mholt@users.noreply.github.com> | 2020-02-14 11:00:16 -0700 |
---|---|---|
committer | Matthew Holt <mholt@users.noreply.github.com> | 2020-02-14 11:01:09 -0700 |
commit | 15bf9c196c5972051f40ebadf50811bd06e328dd (patch) | |
tree | 03362b73a9bdd923bf4f252e346a8441f5de04b0 /caddyconfig/httpcaddyfile/httptype_test.go | |
parent | eb80165583776d878256359f1635ffa9a17f0171 (diff) |
caddyfile: Refactor; NewFromNextSegment(); fix repeated matchers
Now multiple instances of the same matcher can be used within a named
matcher without overwriting previous ones.
Diffstat (limited to 'caddyconfig/httpcaddyfile/httptype_test.go')
-rw-r--r-- | caddyconfig/httpcaddyfile/httptype_test.go | 50 |
1 files changed, 49 insertions, 1 deletions
diff --git a/caddyconfig/httpcaddyfile/httptype_test.go b/caddyconfig/httpcaddyfile/httptype_test.go index ae4f042..3b69677 100644 --- a/caddyconfig/httpcaddyfile/httptype_test.go +++ b/caddyconfig/httpcaddyfile/httptype_test.go @@ -1,6 +1,54 @@ package httpcaddyfile -import "testing" +import ( + "testing" + + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" +) + +func TestServerType(t *testing.T) { + for i, tc := range []struct { + input string + expectWarn bool + expectError bool + }{ + { + input: `http://localhost + @debug { + query showdebug=1 + } + `, + expectWarn: false, + expectError: false, + }, + { + input: `http://localhost + @debug { + query bad format + } + `, + expectWarn: false, + expectError: true, + }, + } { + + adapter := caddyfile.Adapter{ + ServerType: ServerType{}, + } + + _, warnings, err := adapter.Adapt([]byte(tc.input), nil) + + if len(warnings) > 0 != tc.expectWarn { + t.Errorf("Test %d warning expectation failed Expected: %v, got %v", i, tc.expectWarn, warnings) + continue + } + + if err != nil != tc.expectError { + t.Errorf("Test %d error expectation failed Expected: %v, got %s", i, tc.expectError, err) + continue + } + } +} func TestSpecificity(t *testing.T) { for i, tc := range []struct { |