github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-31 00:06:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Address various lint and gocyclo warnings. Fixes #253

Browse Source
This commit is contained in:
Zac Bergquist
2015-10-09 18:35:34 -04:00
parent 17c91152e0
commit f9bc74626d
29 changed files with 293 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
middleware/browse/browse_test.go
View File

@ -117,7 +117,7 @@ func TestBrowseTemplate(t *testing.T) {
}),
Root: "./testdata",
Configs: []Config{
Config{
{
PathScope: "/photos",
Template: tmpl,
},
@ -172,7 +172,7 @@ func TestBrowseJson(t *testing.T) {
}),
Root: "./testdata",
Configs: []Config{
Config{
{
PathScope: "/photos/",
},
},
@ -283,7 +283,7 @@ func TestBrowseJson(t *testing.T) {
t.Fatalf("Expected Content type to be application/json; charset=utf-8, but got %s ", rec.HeaderMap.Get("Content-Type"))
}
actualJsonResponseString := rec.Body.String()
actualJSONResponse := rec.Body.String()
copyOflisting := listing
if test.SortBy == "" {
copyOflisting.Sort = "name"
@ -308,12 +308,11 @@ func TestBrowseJson(t *testing.T) {
if err != nil {
t.Fatalf("Unable to Marshal the listing ")
}
expectedJsonString := string(marsh)
expectedJSON := string(marsh)
if actualJsonResponseString != expectedJsonString {
if actualJSONResponse != expectedJSON {
t.Errorf("JSON response doesn't match the expected for test number %d with sort=%s, order=%s\nExpected response %s\nActual response = %s\n",
i+1, test.SortBy, test.OrderBy, expectedJsonString, actualJsonResponseString)
i+1, test.SortBy, test.OrderBy, expectedJSON, actualJSONResponse)
}
}
}