Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-12-18 02:17:05 +00:00
Code Releases Activity

fix https://github.com/kataras/iris/issues/1273

Browse Source 
Former-commit-id: 2b48b9b912e9eb8f5f2c6d413907dbfdae857e08
This commit is contained in:
Gerasimos (Makis) Maropoulos
2019-06-14 11:26:56 +03:00
parent 272566950d
commit 0f907a3dae
8 changed files with 87 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
hero/func_result_test.go
View File

@@ -70,7 +70,7 @@ func GetCustomStructWithContentType() (testCustomStruct, string) {
return testCustomStruct{"Iris", 2}, "text/xml"
}
func GetCustomStructWithError(ctx iris.Context) (s testCustomStruct, err error) {
func GetCustomStructWithError(ctx context.Context) (s testCustomStruct, err error) {
s = testCustomStruct{"Iris", 2}
if ctx.URLParamExists("err") {
err = errors.New("omit return of testCustomStruct and fire error")
@@ -86,7 +86,7 @@ type err struct {
Message string `json:"message"`
}
func (e err) Dispatch(ctx iris.Context) {
func (e err) Dispatch(ctx context.Context) {
// write the status code based on the err's StatusCode.
ctx.StatusCode(e.Status)
// send to the client the whole object as json
@@ -97,6 +97,22 @@ func GetCustomErrorAsDispatcher() err {
return err{iris.StatusBadRequest, "this is my error as json"}
}
func GetCustomTypedNilEmptyResponse() iris.Map {
return nil
}
func GetCustomTypedPtrNilEmptyResponse() *iris.Map {
return nil
}
func GetCustomMapNilEmptyResponse() map[string]interface{} {
return nil
}
func GetCustomPtrStructNilEmptyResponse() *testCustomStruct {
return nil
}
func TestFuncResult(t *testing.T) {
app := iris.New()
h := New()
@@ -120,6 +136,11 @@ func TestFuncResult(t *testing.T) {
app.Get("/custom/struct/with/error", h.Handler(GetCustomStructWithError))
app.Get("/custom/error/as/dispatcher", h.Handler(GetCustomErrorAsDispatcher))
app.Get("/custom/nil/typed", h.Handler(GetCustomTypedNilEmptyResponse))
app.Get("/custom/nil/typed/ptr", h.Handler(GetCustomTypedPtrNilEmptyResponse))
app.Get("/custom/nil/map", h.Handler(GetCustomMapNilEmptyResponse))
app.Get("/custom/nil/struct", h.Handler(GetCustomPtrStructNilEmptyResponse))
e := httptest.New(t, app)
e.GET("/text").Expect().Status(iris.StatusOK).
@@ -172,4 +193,14 @@ func TestFuncResult(t *testing.T) {
// the content should be not JSON it should be the status code's text
// it will fire the error's text
JSON().Equal(err{iris.StatusBadRequest, "this is my error as json"})
// its result is nil should give an empty response but content-type is set correctly.
e.GET("/custom/nil/typed").Expect().
Status(iris.StatusOK).ContentType(context.ContentJSONHeaderValue).Body().Empty()
e.GET("/custom/nil/typed/ptr").Expect().
Status(iris.StatusOK).ContentType(context.ContentJSONHeaderValue).Body().Empty()
e.GET("/custom/nil/map").Expect().
Status(iris.StatusOK).ContentType(context.ContentJSONHeaderValue).Body().Empty()
e.GET("/custom/nil/struct").Expect().
Status(iris.StatusOK).ContentType(context.ContentJSONHeaderValue).Body().Empty()
}