mirror/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2026-05-25 00:46:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor condition keyword check refactor

Browse Source
This commit is contained in:
Abiola Ibrahim
2016-07-21 15:42:38 +01:00
parent cf3ce49104
commit 3c8b2b5954
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
caddyhttp/httpserver/condition_test.go
View File

@@ -243,7 +243,7 @@ func TestSetupIfMatcher(t *testing.T) {
for i, test := range tests {
c := caddy.NewTestController("http", test.input)
c.Next()
matcher, err := SetupIfMatcher(c.Dispenser)
matcher, err := SetupIfMatcher(c)
if err == nil && test.shouldErr {
t.Errorf("Test %d didn't error, but it should have", i)
} else if err != nil && !test.shouldErr {
@@ -277,8 +277,11 @@ func TestIfMatcherKeyword(t *testing.T) {
{"if_type", false},
{"if_cond", false},
}
for i, test := range tests {
valid := IfMatcherKeyword(test.keyword)
c := caddy.NewTestController("http", test.keyword)
c.Next()
valid := IfMatcherKeyword(c)
if valid != test.expected {
t.Errorf("Test %d: expected %v found %v", i, test.expected, valid)
}