From a3cfe437b1d27fa0eb20d112de7c257cb25e4ea7 Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Mon, 6 Apr 2020 15:05:49 -0400 Subject: caddyhttp: Support single-line not matcher (#3228) * caddyhttp: Support single-line not matcher shortcut * caddyhttp: Some tests, I guess --- caddyconfig/httpcaddyfile/httptype_test.go | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'caddyconfig') diff --git a/caddyconfig/httpcaddyfile/httptype_test.go b/caddyconfig/httpcaddyfile/httptype_test.go index d612cd4..64f0f82 100644 --- a/caddyconfig/httpcaddyfile/httptype_test.go +++ b/caddyconfig/httpcaddyfile/httptype_test.go @@ -6,7 +6,7 @@ import ( "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" ) -func TestServerType(t *testing.T) { +func TestMatcherSyntax(t *testing.T) { for i, tc := range []struct { input string expectWarn bool @@ -15,7 +15,7 @@ func TestServerType(t *testing.T) { { input: `http://localhost @debug { - query showdebug=1 + query showdebug=1 } `, expectWarn: false, @@ -24,12 +24,32 @@ func TestServerType(t *testing.T) { { input: `http://localhost @debug { - query bad format + query bad format } `, expectWarn: false, expectError: true, }, + { + input: `http://localhost + @debug { + not { + path /somepath* + } + } + `, + expectWarn: false, + expectError: false, + }, + { + input: `http://localhost + @debug { + not path /somepath* + } + `, + expectWarn: false, + expectError: false, + }, } { adapter := caddyfile.Adapter{ -- cgit v1.2.3