IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-7 fixing unit test for chunk 2 server

Browse Source
This commit is contained in:
=Corey Hulen
2016-01-22 08:04:02 -06:00
parent dd52e3f729
commit 518efd7d2e
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/post.go
View File

@@ -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, "")
}
}
}

2
web/react/components/create_comment.jsx
View File

@@ -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) {

2
web/react/components/create_post.jsx
View File

@@ -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');
}