summaryrefslogtreecommitdiff
path: root/caddyconfig
diff options
context:
space:
mode:
authorMark Sargent <99003+sarge@users.noreply.github.com>2019-11-30 09:05:22 +1300
committerMatt Holt <mholt@users.noreply.github.com>2019-11-29 13:05:22 -0700
commit8b7d6a9ee8b7f62142df3516a9d9b96031be33fd (patch)
tree95796a3c617515b36453eb81855cb983f71070ac /caddyconfig
parent7c7ef8d40e3af35444d522debc95451c04666615 (diff)
v2: fixes query matcher parsing (#2901)
* fixes query matcher parsing * return correct argument error when parsing query matcher
Diffstat (limited to 'caddyconfig')
-rw-r--r--caddyconfig/httpcaddyfile/parser_test.go66
1 files changed, 66 insertions, 0 deletions
diff --git a/caddyconfig/httpcaddyfile/parser_test.go b/caddyconfig/httpcaddyfile/parser_test.go
new file mode 100644
index 0000000..bcecf66
--- /dev/null
+++ b/caddyconfig/httpcaddyfile/parser_test.go
@@ -0,0 +1,66 @@
+// Copyright 2015 Matthew Holt and The Caddy Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package httpcaddyfile
+
+import (
+ "testing"
+
+ caddyfile "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
+)
+
+func TestParse(t *testing.T) {
+
+ for i, tc := range []struct {
+ input string
+ expectWarn bool
+ expectError bool
+ }{
+ {
+ input: `http://localhost
+ matcher debug {
+ query showdebug=1
+ }
+ `,
+ expectWarn: false,
+ expectError: false,
+ },
+ {
+ input: `http://localhost
+ matcher 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
+ }
+ }
+}