Skip to content

Commit

Permalink
Don't use t.Run in tests, not supported in earlier Go versions
Browse files Browse the repository at this point in the history
This package is meant to work on Go versions going back to Go 1.3,
which means tests can't use testing.T.Run which doesn't exists in Go
1.6 and earlier.
  • Loading branch information
nwidger authored and kisielk committed Sep 28, 2018
1 parent 3ab3680 commit f57b7e2
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 42 deletions.
17 changes: 7 additions & 10 deletions cookie_go111_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package sessions

import (
"net/http"
"strconv"
"testing"
)

Expand All @@ -19,14 +18,12 @@ func TestNewCookieFromOptionsSameSite(t *testing.T) {
{http.SameSiteStrictMode},
}
for i, v := range tests {
t.Run(strconv.Itoa(i+1), func(t *testing.T) {
options := &Options{
SameSite: v.sameSite,
}
cookie := newCookieFromOptions("", "", options)
if cookie.SameSite != v.sameSite {
t.Fatalf("bad cookie sameSite: got %v, want %v", cookie.SameSite, v.sameSite)
}
})
options := &Options{
SameSite: v.sameSite,
}
cookie := newCookieFromOptions("", "", options)
if cookie.SameSite != v.sameSite {
t.Fatalf("%v: bad cookie sameSite: got %v, want %v", i+1, cookie.SameSite, v.sameSite)
}
}
}
61 changes: 29 additions & 32 deletions cookie_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package sessions

import (
"strconv"
"testing"
)

Expand All @@ -25,36 +24,34 @@ func TestNewCookieFromOptions(t *testing.T) {
{"foo", "bar", "/foo/bar", "foo.example.com", 3600, true, false},
}
for i, v := range tests {
t.Run(strconv.Itoa(i+1), func(t *testing.T) {
options := &Options{
Path: v.path,
Domain: v.domain,
MaxAge: v.maxAge,
Secure: v.secure,
HttpOnly: v.httpOnly,
}
cookie := newCookieFromOptions(v.name, v.value, options)
if cookie.Name != v.name {
t.Fatalf("bad cookie name: got %q, want %q", cookie.Name, v.name)
}
if cookie.Value != v.value {
t.Fatalf("bad cookie value: got %q, want %q", cookie.Value, v.value)
}
if cookie.Path != v.path {
t.Fatalf("bad cookie path: got %q, want %q", cookie.Path, v.path)
}
if cookie.Domain != v.domain {
t.Fatalf("bad cookie domain: got %q, want %q", cookie.Domain, v.domain)
}
if cookie.MaxAge != v.maxAge {
t.Fatalf("bad cookie maxAge: got %q, want %q", cookie.MaxAge, v.maxAge)
}
if cookie.Secure != v.secure {
t.Fatalf("bad cookie secure: got %v, want %v", cookie.Secure, v.secure)
}
if cookie.HttpOnly != v.httpOnly {
t.Fatalf("bad cookie httpOnly: got %v, want %v", cookie.HttpOnly, v.httpOnly)
}
})
options := &Options{
Path: v.path,
Domain: v.domain,
MaxAge: v.maxAge,
Secure: v.secure,
HttpOnly: v.httpOnly,
}
cookie := newCookieFromOptions(v.name, v.value, options)
if cookie.Name != v.name {
t.Fatalf("%v: bad cookie name: got %q, want %q", i+1, cookie.Name, v.name)
}
if cookie.Value != v.value {
t.Fatalf("%v: bad cookie value: got %q, want %q", i+1, cookie.Value, v.value)
}
if cookie.Path != v.path {
t.Fatalf("%v: bad cookie path: got %q, want %q", i+1, cookie.Path, v.path)
}
if cookie.Domain != v.domain {
t.Fatalf("%v: bad cookie domain: got %q, want %q", i+1, cookie.Domain, v.domain)
}
if cookie.MaxAge != v.maxAge {
t.Fatalf("%v: bad cookie maxAge: got %q, want %q", i+1, cookie.MaxAge, v.maxAge)
}
if cookie.Secure != v.secure {
t.Fatalf("%v: bad cookie secure: got %v, want %v", i+1, cookie.Secure, v.secure)
}
if cookie.HttpOnly != v.httpOnly {
t.Fatalf("%v: bad cookie httpOnly: got %v, want %v", i+1, cookie.HttpOnly, v.httpOnly)
}
}
}

0 comments on commit f57b7e2

Please sign in to comment.