From 5137859e47678aae81e178ca7d164f9e2b4e3121 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Fri, 14 Jun 2019 11:58:28 -0600 Subject: Rename caddy2 -> caddy Removes the version from the package name --- modules/caddyhttp/matchers_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'modules/caddyhttp/matchers_test.go') diff --git a/modules/caddyhttp/matchers_test.go b/modules/caddyhttp/matchers_test.go index 9e5ee45..08ab156 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()) -- cgit v1.2.3