From 518efd7d2e971572c104dde09f90ef9f7619dd08 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Fri, 22 Jan 2016 08:04:02 -0600 Subject: PLT-7 fixing unit test for chunk 2 server --- api/post.go | 14 ++++++-------- web/react/components/create_comment.jsx | 2 +- web/react/components/create_post.jsx | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/api/post.go b/api/post.go index ee1429d90..bb6bcb337 100644 --- a/api/post.go +++ b/api/post.go @@ -53,7 +53,9 @@ func createPost(c *Context, w http.ResponseWriter, r *http.Request) { if rp, err := CreatePost(c, post, true); err != nil { c.Err = err - if strings.Contains(c.Err.Message, "parameter") { + if c.Err.Id == "api.post.create_post.root_id.app_error" || + c.Err.Id == "api.post.create_post.channel_root_id.app_error" || + c.Err.Id == "api.post.create_post.parent_id.app_error" { c.Err.StatusCode = http.StatusBadRequest } @@ -75,15 +77,12 @@ func CreatePost(c *Context, post *model.Post, triggerWebhooks bool) (*model.Post // Verify the parent/child relationships are correct if pchan != nil { - // somehow tests fail here if we use the commented lines if presult := <-pchan; presult.Err != nil { - //return nil, model.NewLocAppError("createPost", "api.post.create_post.root_id.app_error", nil, "") - return nil, model.NewAppError("createPost", "Invalid RootId parameter", "") + return nil, model.NewLocAppError("createPost", "api.post.create_post.root_id.app_error", nil, "") } else { list := presult.Data.(*model.PostList) if len(list.Posts) == 0 || !list.IsChannelId(post.ChannelId) { - //return nil, model.NewLocAppError("createPost", "api.post.create_post.channel_root_id.app_error", nil, "") - return nil, model.NewAppError("createPost", "Invalid ChannelId for RootId parameter", "") + return nil, model.NewLocAppError("createPost", "api.post.create_post.channel_root_id.app_error", nil, "") } if post.ParentId == "" { @@ -93,8 +92,7 @@ func CreatePost(c *Context, post *model.Post, triggerWebhooks bool) (*model.Post if post.RootId != post.ParentId { parent := list.Posts[post.ParentId] if parent == nil { - //return nil, model.NewLocAppError("createPost", "api.post.create_post.parent_id.app_error", nil, "") - return nil, model.NewAppError("createPost", "Invalid ParentId parameter", "") + return nil, model.NewLocAppError("createPost", "api.post.create_post.parent_id.app_error", nil, "") } } } diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx index cae94429c..aa7ab6a7b 100644 --- a/web/react/components/create_comment.jsx +++ b/web/react/components/create_comment.jsx @@ -129,7 +129,7 @@ export default class CreateComment extends React.Component { function handlePostError(err) { let state = {}; - if (err.message === 'Invalid RootId parameter') { + if (err.id === 'api.post.create_post.root_id.app_error') { PostStore.removePendingPost(post.channel_id, post.pending_post_id); if ($('#post_deleted').length > 0) { diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index a476863a3..de971c43f 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -191,7 +191,7 @@ export default class CreatePost extends React.Component { (err) => { const state = {}; - if (err.message === 'Invalid RootId parameter') { + if (err.id === 'api.post.create_post.root_id.app_error') { if ($('#post_deleted').length > 0) { $('#post_deleted').modal('show'); } -- cgit v1.2.3-1-g7c22