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

Merge pull request #4137 from cpradio/add-warning-to-flag

Browse Source 
FEATURE: Add warning input to flag dialog when notifying a user
This commit is contained in:
Sam
2016-04-15 16:23:22 +10:00
parent 0119a2f980 67cd08af9b
commit 9e50f36c50
10 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spec/controllers/post_actions_controller_spec.rb
View File

@ -49,6 +49,17 @@ describe PostActionsController do
xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], message: 'action message goes here'
end
it 'passes the message through as warning' do
PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {message: 'action message goes here', is_warning: true})
xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], message: 'action message goes here', is_warning: true
end
it "doesn't create message as a warning if the user isn't staff" do
Guardian.any_instance.stubs(:is_staff?).returns(false)
PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {message: 'action message goes here'})
xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], message: 'action message goes here', is_warning: true
end
it 'passes take_action through' do
PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {take_action: true})
xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], take_action: 'true'