Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove golint errors about string as context key #42

Merged
merged 2 commits into from Oct 25, 2016
Merged

remove golint errors about string as context key #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2da90d
remove golint errors about string as context key
Oct 25, 2016
507dc11
bugfix: pass the test
Oct 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pat/match_test.go
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ func TestExistingContext(t *testing.T) {
"hello": "world",
"c": "nope",
})
ctx = context.WithValue(ctx, "user", "carl")
ctx = context.WithValue(ctx, pattern.Variable("user"), "carl")

req = req.WithContext(ctx)
req = pat.Match(req)
Expand Down Expand Up @@ -54,7 +54,7 @@ func TestExistingContext(t *testing.T) {
t.Errorf("expected path=%q, got %q", "", path)
}

if user := ctx.Value("user"); user != "carl" {
if user := ctx.Value(pattern.Variable("user")); user != "carl" {
t.Errorf("expected user=%q, got %q", "carl", user)
}
}
9 changes: 5 additions & 4 deletions router_test.go
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@ import (
"testing"

"goji.io/internal"
"goji.io/pattern"
)

func TestNoMatch(t *testing.T) {
Expand All @@ -20,7 +21,7 @@ func TestNoMatch(t *testing.T) {
ctx := context.Background()
ctx = context.WithValue(ctx, internal.Pattern, boolPattern(true))
ctx = context.WithValue(ctx, internal.Pattern, boolPattern(true))
ctx = context.WithValue(ctx, "answer", 42)
ctx = context.WithValue(ctx, pattern.Variable("answer"), 42)
ctx = context.WithValue(ctx, internal.Path, "/")

r = r.WithContext(ctx)
Expand All @@ -33,7 +34,7 @@ func TestNoMatch(t *testing.T) {
if h := ctx.Value(internal.Handler); h != nil {
t.Errorf("unexpected handler %v", h)
}
if h := ctx.Value("answer"); h != 42 {
if h := ctx.Value(pattern.Variable("answer")); h != 42 {
t.Errorf("context didn't work: got %v, wanted %v", h, 42)
}
}
Expand Down Expand Up @@ -134,7 +135,7 @@ func TestRouter(t *testing.T) {
type contextPattern struct{}

func (contextPattern) Match(r *http.Request) *http.Request {
return r.WithContext(context.WithValue(r.Context(), "hello", "world"))
return r.WithContext(context.WithValue(r.Context(), pattern.Variable("hello"), "world"))
}

func TestRouterContextPropagation(t *testing.T) {
Expand All @@ -146,7 +147,7 @@ func TestRouterContextPropagation(t *testing.T) {
r = r.WithContext(context.WithValue(r.Context(), internal.Path, "/"))
r2 := rt.route(r)
ctx := r2.Context()
if hello := ctx.Value("hello").(string); hello != "world" {
if hello := ctx.Value(pattern.Variable("hello")).(string); hello != "world" {
t.Fatalf("routed request didn't include correct key from pattern: %q", hello)
}
}