aboutsummaryrefslogtreecommitdiffhomepage
path: root/modules/caddyhttp/matchers_test.go
diff options
context:
space:
mode:
authorMatthew Holt <[email protected]>2019-06-14 11:58:28 -0600
committerMatthew Holt <[email protected]>2019-06-14 11:58:28 -0600
commit5137859e47678aae81e178ca7d164f9e2b4e3121 (patch)
treef0e5cb9b9a4ad5dc03b53127fcea2a536bd6ee27 /modules/caddyhttp/matchers_test.go
parentb8e7453fef3dac6036403bc384eec96becff5114 (diff)
downloadcaddy-5137859e47678aae81e178ca7d164f9e2b4e3121.tar.gz
caddy-5137859e47678aae81e178ca7d164f9e2b4e3121.zip
Rename caddy2 -> caddy
Removes the version from the package name
Diffstat (limited to 'modules/caddyhttp/matchers_test.go')
-rw-r--r--modules/caddyhttp/matchers_test.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/caddyhttp/matchers_test.go b/modules/caddyhttp/matchers_test.go
index 9e5ee45ca..08ab15662 100644
--- a/modules/caddyhttp/matchers_test.go
+++ b/modules/caddyhttp/matchers_test.go
@@ -8,7 +8,7 @@ import (
"net/url"
"testing"
- "github.com/caddyserver/caddy2"
+ "github.com/caddyserver/caddy"
)
func TestHostMatcher(t *testing.T) {
@@ -227,8 +227,8 @@ func TestPathREMatcher(t *testing.T) {
// set up the fake request and its Replacer
req := &http.Request{URL: &url.URL{Path: tc.input}}
- repl := caddy2.NewReplacer()
- ctx := context.WithValue(req.Context(), caddy2.ReplacerCtxKey, repl)
+ repl := caddy.NewReplacer()
+ ctx := context.WithValue(req.Context(), caddy.ReplacerCtxKey, repl)
req = req.WithContext(ctx)
addHTTPVarsToReplacer(repl, req, httptest.NewRecorder())
@@ -345,8 +345,8 @@ func TestHeaderREMatcher(t *testing.T) {
// set up the fake request and its Replacer
req := &http.Request{Header: tc.input, URL: new(url.URL)}
- repl := caddy2.NewReplacer()
- ctx := context.WithValue(req.Context(), caddy2.ReplacerCtxKey, repl)
+ repl := caddy.NewReplacer()
+ ctx := context.WithValue(req.Context(), caddy.ReplacerCtxKey, repl)
req = req.WithContext(ctx)
addHTTPVarsToReplacer(repl, req, httptest.NewRecorder())