Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
caddy
Commits
55a564df
Commit
55a564df
authored
Jan 16, 2018
by
Tw
Committed by
Matt Holt
Jan 15, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
template: add extension filter test and simplify test code (#1996)
Signed-off-by:
Tw
<
tw19881113@gmail.com
>
parent
8a326d4d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
67 additions
and
87 deletions
+67
-87
caddyhttp/templates/templates_test.go
caddyhttp/templates/templates_test.go
+66
-87
caddyhttp/templates/testdata/as_it_is.txt
caddyhttp/templates/testdata/as_it_is.txt
+1
-0
No files found.
caddyhttp/templates/templates_test.go
View file @
55a564df
...
...
@@ -62,100 +62,79 @@ func TestTemplates(t *testing.T) {
BufPool
:
&
sync
.
Pool
{
New
:
func
()
interface
{}
{
return
new
(
bytes
.
Buffer
)
}},
}
// Test tmpl on /photos/test.html
req
,
err
:=
http
.
NewRequest
(
"GET"
,
"/photos/test.html"
,
nil
)
if
err
!=
nil
{
t
.
Fatalf
(
"Test: Could not create HTTP request: %v"
,
err
)
}
req
=
req
.
WithContext
(
context
.
WithValue
(
req
.
Context
(),
httpserver
.
OriginalURLCtxKey
,
*
req
.
URL
))
rec
:=
httptest
.
NewRecorder
()
tmpl
.
ServeHTTP
(
rec
,
req
)
if
rec
.
Code
!=
http
.
StatusOK
{
t
.
Fatalf
(
"Test: Wrong response code: %d, should be %d"
,
rec
.
Code
,
http
.
StatusOK
)
}
// register custom function which is used in template
httpserver
.
TemplateFuncs
[
"root"
]
=
func
()
string
{
return
"root"
}
respBody
:=
rec
.
Body
.
String
()
expectedBody
:=
`<!DOCTYPE html><html><head><title>test page</title></head><body><h1>Header title</h1>
for
_
,
c
:=
range
[]
struct
{
tpl
Templates
req
string
respCode
int
res
string
}{
{
tpl
:
tmpl
,
req
:
"/photos/test.html"
,
respCode
:
http
.
StatusOK
,
res
:
`<!DOCTYPE html><html><head><title>test page</title></head><body><h1>Header title</h1>
</body></html>
`
if
respBody
!=
expectedBody
{
t
.
Fatalf
(
"Test: the expected body %v is different from the response one: %v"
,
expectedBody
,
respBody
)
}
// Test tmpl on /images/img.htm
req
,
err
=
http
.
NewRequest
(
"GET"
,
"/images/img.htm"
,
nil
)
if
err
!=
nil
{
t
.
Fatalf
(
"Could not create HTTP request: %v"
,
err
)
}
req
=
req
.
WithContext
(
context
.
WithValue
(
req
.
Context
(),
httpserver
.
OriginalURLCtxKey
,
*
req
.
URL
))
rec
=
httptest
.
NewRecorder
()
tmpl
.
ServeHTTP
(
rec
,
req
)
if
rec
.
Code
!=
http
.
StatusOK
{
t
.
Fatalf
(
"Test: Wrong response code: %d, should be %d"
,
rec
.
Code
,
http
.
StatusOK
)
}
`
,
},
respBody
=
rec
.
Body
.
String
()
expectedBody
=
`<!DOCTYPE html><html><head><title>img</title></head><body><h1>Header title</h1>
{
tpl
:
tmpl
,
req
:
"/images/img.htm"
,
respCode
:
http
.
StatusOK
,
res
:
`<!DOCTYPE html><html><head><title>img</title></head><body><h1>Header title</h1>
</body></html>
`
if
respBody
!=
expectedBody
{
t
.
Fatalf
(
"Test: the expected body %v is different from the response one: %v"
,
expectedBody
,
respBody
)
}
// Test tmpl on /images/img2.htm
req
,
err
=
http
.
NewRequest
(
"GET"
,
"/images/img2.htm"
,
nil
)
if
err
!=
nil
{
t
.
Fatalf
(
"Could not create HTTP request: %v"
,
err
)
}
req
=
req
.
WithContext
(
context
.
WithValue
(
req
.
Context
(),
httpserver
.
OriginalURLCtxKey
,
*
req
.
URL
))
rec
=
httptest
.
NewRecorder
()
tmpl
.
ServeHTTP
(
rec
,
req
)
if
rec
.
Code
!=
http
.
StatusOK
{
t
.
Fatalf
(
"Test: Wrong response code: %d, should be %d"
,
rec
.
Code
,
http
.
StatusOK
)
}
respBody
=
rec
.
Body
.
String
()
expectedBody
=
`<!DOCTYPE html><html><head><title>img</title></head><body>{{.Include "header.html"}}</body></html>
`
if
respBody
!=
expectedBody
{
t
.
Fatalf
(
"Test: the expected body %v is different from the response one: %v"
,
expectedBody
,
respBody
)
}
// Test tmplroot on /root.html
req
,
err
=
http
.
NewRequest
(
"GET"
,
"/root.html"
,
nil
)
if
err
!=
nil
{
t
.
Fatalf
(
"Could not create HTTP request: %v"
,
err
)
}
req
=
req
.
WithContext
(
context
.
WithValue
(
req
.
Context
(),
httpserver
.
OriginalURLCtxKey
,
*
req
.
URL
))
rec
=
httptest
.
NewRecorder
()
// register custom function which is used in template
httpserver
.
TemplateFuncs
[
"root"
]
=
func
()
string
{
return
"root"
}
tmplroot
.
ServeHTTP
(
rec
,
req
)
`
,
},
if
rec
.
Code
!=
http
.
StatusOK
{
t
.
Fatalf
(
"Test: Wrong response code: %d, should be %d"
,
rec
.
Code
,
http
.
StatusOK
)
}
{
tpl
:
tmpl
,
req
:
"/images/img2.htm"
,
respCode
:
http
.
StatusOK
,
res
:
`<!DOCTYPE html><html><head><title>img</title></head><body>{{.Include "header.html"}}</body></html>
`
,
},
respBody
=
rec
.
Body
.
String
()
expectedBody
=
`<!DOCTYPE html><html><head><title>root</title></head><body><h1>Header title</h1>
{
tpl
:
tmplroot
,
req
:
"/root.html"
,
respCode
:
http
.
StatusOK
,
res
:
`<!DOCTYPE html><html><head><title>root</title></head><body><h1>Header title</h1>
</body></html>
`
`
,
},
if
respBody
!=
expectedBody
{
t
.
Fatalf
(
"Test: the expected body %v is different from the response one: %v"
,
expectedBody
,
respBody
)
// test extension filter
{
tpl
:
tmplroot
,
req
:
"/as_it_is.txt"
,
respCode
:
http
.
StatusOK
,
res
:
`<!DOCTYPE html><html><head><title>as it is</title></head><body>{{.Include "header.html"}}</body></html>
`
,
},
}
{
c
:=
c
t
.
Run
(
""
,
func
(
t
*
testing
.
T
)
{
req
,
err
:=
http
.
NewRequest
(
"GET"
,
c
.
req
,
nil
)
if
err
!=
nil
{
t
.
Fatalf
(
"Test: Could not create HTTP request: %v"
,
err
)
}
req
=
req
.
WithContext
(
context
.
WithValue
(
req
.
Context
(),
httpserver
.
OriginalURLCtxKey
,
*
req
.
URL
))
rec
:=
httptest
.
NewRecorder
()
c
.
tpl
.
ServeHTTP
(
rec
,
req
)
if
rec
.
Code
!=
c
.
respCode
{
t
.
Fatalf
(
"Test: Wrong response code: %d, should be %d"
,
rec
.
Code
,
c
.
respCode
)
}
respBody
:=
rec
.
Body
.
String
()
if
respBody
!=
c
.
res
{
t
.
Fatalf
(
"Test: the expected body %v is different from the response one: %v"
,
c
.
res
,
respBody
)
}
})
}
}
caddyhttp/templates/testdata/as_it_is.txt
0 → 100644
View file @
55a564df
<!DOCTYPE html><html><head><title>as it is</title></head><body>{{.Include "header.html"}}</body></html>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment