Skip to content

Commit

Permalink
[webui] fix comment requests
Browse files Browse the repository at this point in the history
creator role does not make sense for CommentforPackage
  • Loading branch information
coolo committed Dec 13, 2013
1 parent 19afc8c commit 8f0a534
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
6 changes: 5 additions & 1 deletion src/api/app/models/event/comment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module CommitEvent
def self.included(base)
base.class_eval do
payload_keys :commenters, :commenter, :comment_body, :comment_title
receiver_roles :maintainer, :creator, :reviewer, :commenter
receiver_roles :commenter
end
end

Expand All @@ -24,6 +24,8 @@ def commenters

class Event::CommentForProject < ::Event::Project
include CommitEvent
receiver_roles :maintainer

self.description = 'New comment for project created'

def subject
Expand All @@ -34,6 +36,7 @@ def subject

class Event::CommentForPackage < ::Event::Package
include CommitEvent
receiver_roles :maintainer

self.description = 'New comment for package created'

Expand All @@ -48,6 +51,7 @@ class Event::CommentForRequest < ::Event::Request
include CommitEvent
self.description = 'New comment for request created'
payload_keys :request_id
receiver_roles :target_maintainer, :creator, :reviewer

def subject
"New comment in request #{payload['id']} by #{User.find(payload['commenter']).login}: #{payload['comment_title']}"
Expand Down
8 changes: 4 additions & 4 deletions src/api/test/functional/webui/user_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ def test_edit
page.must_have_checked_field('RequestStatechange_creator')
uncheck('RequestStatechange_creator')
check('CommentForPackage_maintainer')
check('CommentForPackage_creator')
check('CommentForPackage_commenter')
check('CommentForProject_maintainer')
check('CommentForProject_reviewer')
check('CommentForProject_commenter')
click_button 'Update'
flash_message.must_equal 'Notifications settings updated'
page.must_have_text 'Events to get email for'
page.must_have_unchecked_field('RequestStatechange_creator')
page.must_have_checked_field('CommentForPackage_maintainer')
page.must_have_checked_field('CommentForPackage_creator')
page.must_have_checked_field('CommentForPackage_commenter')
page.must_have_checked_field('CommentForProject_maintainer')
page.must_have_checked_field('CommentForProject_reviewer')
page.must_have_checked_field('CommentForProject_commenter')
end
end

0 comments on commit 8f0a534

Please sign in to comment.