Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Go Httpbin
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Jira
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Container registry
Monitor
Service Desk
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSS
Nix
Go Httpbin
Commits
c4135f95
Commit
c4135f95
authored
8 years ago
by
Will McCutchen
Browse files
Options
Downloads
Patches
Plain Diff
Simpler, unified redirect tests
parent
f250bba4
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
httpbin/handlers_test.go
+41
-99
41 additions, 99 deletions
httpbin/handlers_test.go
httpbin/httpbin.go
+9
-1
9 additions, 1 deletion
httpbin/httpbin.go
with
50 additions
and
100 deletions
httpbin/handlers_test.go
+
41
−
99
View file @
c4135f95
...
@@ -735,130 +735,72 @@ func TestResponseHeaders__OverrideContentType(t *testing.T) {
...
@@ -735,130 +735,72 @@ func TestResponseHeaders__OverrideContentType(t *testing.T) {
assertContentType
(
t
,
w
,
contentType
)
assertContentType
(
t
,
w
,
contentType
)
}
}
func
TestRedirect__OK
(
t
*
testing
.
T
)
{
func
TestRedirect
s
__OK
(
t
*
testing
.
T
)
{
var
tests
=
[]
struct
{
var
tests
=
[]
struct
{
relative
bool
requestURL
string
n
int
expectedLocation
string
location
string
}{
}{
{
true
,
1
,
"/get"
},
{
"/redirect/1"
,
"/get"
},
{
true
,
2
,
"/relative-redirect/1"
},
{
"/redirect/2"
,
"/relative-redirect/1"
},
{
true
,
100
,
"/relative-redirect/99"
},
{
"/redirect/
100
"
,
"/relative-redirect/99"
},
{
false
,
1
,
"http://host/get"
},
{
"/redirect/1?absolute=true"
,
"http://host/get"
},
{
false
,
2
,
"http://host/absolute-redirect/1"
},
{
"/redirect/2?absolute=TRUE"
,
"http://host/absolute-redirect/1"
},
{
false
,
100
,
"http://host/absolute-redirect/99"
},
{
"/redirect/100?absolute=True"
,
"http://host/absolute-redirect/99"
},
}
for
_
,
test
:=
range
tests
{
u
:=
fmt
.
Sprintf
(
"/redirect/%d"
,
test
.
n
)
if
!
test
.
relative
{
u
=
fmt
.
Sprintf
(
"%s?absolute=true"
,
u
)
}
r
,
_
:=
http
.
NewRequest
(
"GET"
,
u
,
nil
)
r
.
Host
=
"host"
w
:=
httptest
.
NewRecorder
()
handler
.
ServeHTTP
(
w
,
r
)
assertStatusCode
(
t
,
w
,
http
.
StatusFound
)
assertHeader
(
t
,
w
,
"Location"
,
test
.
location
)
}
}
func
TestRedirect__Errors
(
t
*
testing
.
T
)
{
var
tests
=
[]
struct
{
relative
bool
given
interface
{}
status
int
}{
{
true
,
3.14
,
http
.
StatusBadRequest
},
{
true
,
-
1
,
http
.
StatusBadRequest
},
{
true
,
""
,
http
.
StatusBadRequest
},
{
true
,
"foo"
,
http
.
StatusBadRequest
},
{
true
,
"10/bar"
,
http
.
StatusNotFound
},
{
false
,
3.14
,
http
.
StatusBadRequest
},
{
false
,
-
1
,
http
.
StatusBadRequest
},
{
false
,
""
,
http
.
StatusBadRequest
},
{
false
,
"foo"
,
http
.
StatusBadRequest
},
{
false
,
"10/bar"
,
http
.
StatusNotFound
},
}
for
_
,
test
:=
range
tests
{
{
"/redirect/100?absolute=t"
,
"/relative-redirect/99"
},
u
:=
fmt
.
Sprintf
(
"/redirect/%v"
,
test
.
given
)
{
"/redirect/100?absolute=1"
,
"/relative-redirect/99"
},
if
!
test
.
relative
{
{
"/redirect/100?absolute=yes"
,
"/relative-redirect/99"
},
u
=
fmt
.
Sprintf
(
"%s?absolute=true"
,
u
)
}
r
,
_
:=
http
.
NewRequest
(
"GET"
,
u
,
nil
)
w
:=
httptest
.
NewRecorder
()
handler
.
ServeHTTP
(
w
,
r
)
assertStatusCode
(
t
,
w
,
test
.
status
)
{
"/relative-redirect/1"
,
"/get"
},
}
{
"/relative-redirect/2"
,
"/relative-redirect/1"
},
}
{
"/relative-redirect/100"
,
"/relative-redirect/99"
},
func
TestAbsoluteAndRelativeRedirects__OK
(
t
*
testing
.
T
)
{
{
"/absolute-redirect/1"
,
"http://host/get"
},
var
tests
=
[]
struct
{
{
"/absolute-redirect/2"
,
"http://host/absolute-redirect/1"
},
relative
bool
{
"/absolute-redirect/100"
,
"http://host/absolute-redirect/99"
},
n
int
location
string
}{
{
true
,
1
,
"/get"
},
{
true
,
2
,
"/relative-redirect/1"
},
{
true
,
100
,
"/relative-redirect/99"
},
{
false
,
1
,
"http://host/get"
},
{
false
,
2
,
"http://host/absolute-redirect/1"
},
{
false
,
100
,
"http://host/absolute-redirect/99"
},
}
}
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
var
urlTemplate
string
r
,
_
:=
http
.
NewRequest
(
"GET"
,
test
.
requestURL
,
nil
)
if
test
.
relative
{
urlTemplate
=
"/relative-redirect/%d"
}
else
{
urlTemplate
=
"/absolute-redirect/%d"
}
r
,
_
:=
http
.
NewRequest
(
"GET"
,
fmt
.
Sprintf
(
urlTemplate
,
test
.
n
),
nil
)
r
.
Host
=
"host"
r
.
Host
=
"host"
w
:=
httptest
.
NewRecorder
()
w
:=
httptest
.
NewRecorder
()
handler
.
ServeHTTP
(
w
,
r
)
handler
.
ServeHTTP
(
w
,
r
)
assertStatusCode
(
t
,
w
,
http
.
StatusFound
)
assertStatusCode
(
t
,
w
,
http
.
StatusFound
)
assertHeader
(
t
,
w
,
"Location"
,
test
.
l
ocation
)
assertHeader
(
t
,
w
,
"Location"
,
test
.
expectedL
ocation
)
}
}
}
}
func
Test
AbsoluteAndRelative
Redirects__Errors
(
t
*
testing
.
T
)
{
func
TestRedirects__Errors
(
t
*
testing
.
T
)
{
var
tests
=
[]
struct
{
var
tests
=
[]
struct
{
relative
bool
requestURL
string
given
interface
{}
expectedStatus
int
status
int
}{
}{
{
true
,
3.14
,
http
.
StatusBadRequest
},
{
"/redirect"
,
http
.
StatusNotFound
},
{
true
,
-
1
,
http
.
StatusBadRequest
},
{
"/redirect/"
,
http
.
StatusBadRequest
},
{
true
,
""
,
http
.
StatusBadRequest
},
{
"/redirect/3.14"
,
http
.
StatusBadRequest
},
{
true
,
"foo"
,
http
.
StatusBadRequest
},
{
"/redirect/foo"
,
http
.
StatusBadRequest
},
{
true
,
"10/bar"
,
http
.
StatusNotFound
},
{
"/redirect/10/foo"
,
http
.
StatusNotFound
},
{
"/relative-redirect"
,
http
.
StatusNotFound
},
{
"/relative-redirect/"
,
http
.
StatusBadRequest
},
{
"/relative-redirect/3.14"
,
http
.
StatusBadRequest
},
{
"/relative-redirect/foo"
,
http
.
StatusBadRequest
},
{
"/relative-redirect/10/foo"
,
http
.
StatusNotFound
},
{
false
,
3.14
,
http
.
Status
BadRequest
},
{
"/absolute-redirect"
,
http
.
Status
NotFound
},
{
false
,
-
1
,
http
.
StatusBadRequest
},
{
"/absolute-redirect/"
,
http
.
StatusBadRequest
},
{
false
,
"
"
,
http
.
StatusBadRequest
},
{
"/absolute-redirect/3.14
"
,
http
.
StatusBadRequest
},
{
false
,
"
foo"
,
http
.
StatusBadRequest
},
{
"/absolute-redirect/
foo"
,
http
.
StatusBadRequest
},
{
false
,
"10/bar
"
,
http
.
StatusNotFound
},
{
"/absolute-redirect/10/foo
"
,
http
.
StatusNotFound
},
}
}
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
var
urlTemplate
string
r
,
_
:=
http
.
NewRequest
(
"GET"
,
test
.
requestURL
,
nil
)
if
test
.
relative
{
urlTemplate
=
"/relative-redirect/%v"
}
else
{
urlTemplate
=
"/absolute-redirect/%v"
}
r
,
_
:=
http
.
NewRequest
(
"GET"
,
fmt
.
Sprintf
(
urlTemplate
,
test
.
given
),
nil
)
w
:=
httptest
.
NewRecorder
()
w
:=
httptest
.
NewRecorder
()
handler
.
ServeHTTP
(
w
,
r
)
handler
.
ServeHTTP
(
w
,
r
)
assertStatusCode
(
t
,
w
,
test
.
s
tatus
)
assertStatusCode
(
t
,
w
,
test
.
expectedS
tatus
)
}
}
}
}
This diff is collapsed.
Click to expand it.
httpbin/httpbin.go
+
9
−
1
View file @
c4135f95
...
@@ -64,13 +64,21 @@ func (h *HTTPBin) Handler() http.Handler {
...
@@ -64,13 +64,21 @@ func (h *HTTPBin) Handler() http.Handler {
mux
.
HandleFunc
(
"/ip"
,
h
.
IP
)
mux
.
HandleFunc
(
"/ip"
,
h
.
IP
)
mux
.
HandleFunc
(
"/user-agent"
,
h
.
UserAgent
)
mux
.
HandleFunc
(
"/user-agent"
,
h
.
UserAgent
)
mux
.
HandleFunc
(
"/headers"
,
h
.
Headers
)
mux
.
HandleFunc
(
"/headers"
,
h
.
Headers
)
mux
.
HandleFunc
(
"/status/"
,
h
.
Status
)
mux
.
HandleFunc
(
"/response-headers"
,
h
.
ResponseHeaders
)
mux
.
HandleFunc
(
"/response-headers"
,
h
.
ResponseHeaders
)
mux
.
HandleFunc
(
"/status/"
,
h
.
Status
)
mux
.
HandleFunc
(
"/redirect/"
,
h
.
Redirect
)
mux
.
HandleFunc
(
"/redirect/"
,
h
.
Redirect
)
mux
.
HandleFunc
(
"/relative-redirect/"
,
h
.
RelativeRedirect
)
mux
.
HandleFunc
(
"/relative-redirect/"
,
h
.
RelativeRedirect
)
mux
.
HandleFunc
(
"/absolute-redirect/"
,
h
.
AbsoluteRedirect
)
mux
.
HandleFunc
(
"/absolute-redirect/"
,
h
.
AbsoluteRedirect
)
// Make sure our ServeMux doesn't "helpfully" redirect these invalid
// endpoints by adding a trailing slash. See the ServeMux docs for more
// info: https://golang.org/pkg/net/http/#ServeMux
mux
.
HandleFunc
(
"/status"
,
http
.
NotFound
)
mux
.
HandleFunc
(
"/redirect"
,
http
.
NotFound
)
mux
.
HandleFunc
(
"/relative-redirect"
,
http
.
NotFound
)
mux
.
HandleFunc
(
"/absolute-redirect"
,
http
.
NotFound
)
return
logger
(
cors
(
mux
))
return
logger
(
cors
(
mux
))
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment