summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-28 12:14:53 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-28 12:14:53 +0200
commitf49a2ac0df978eaf897a8c8b28a202ae9a01165f (patch)
treeba5b55b33552dd12341b0457b7f043d91fae6bf2 /spec
parent9e616459e068f2ba65f90016a09387a192fe4cfc (diff)
downloadgitlab-ce-f49a2ac0df978eaf897a8c8b28a202ae9a01165f.tar.gz
Add close issue/mr methods to Notify. Refactored Notificationservice
Diffstat (limited to 'spec')
-rw-r--r--spec/services/notification_service_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 6fe18bb798a..0c6c014429b 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -65,11 +65,11 @@ describe NotificationService do
end
def should_email(user_id)
- Notify.should_receive(:issue_status_changed_email).with(user_id, issue.id, issue.assignee_id)
+ Notify.should_receive(:closed_issue_email).with(user_id, issue.id, issue.assignee_id)
end
def should_not_email(user_id)
- Notify.should_not_receive(:issue_status_changed_email).with(user_id, issue.id, issue.assignee_id)
+ Notify.should_not_receive(:closed_issue_email).with(user_id, issue.id, issue.assignee_id)
end
end
end
@@ -123,7 +123,7 @@ describe NotificationService do
should_email(@u_watcher.id)
should_not_email(@u_participating.id)
should_not_email(@u_disabled.id)
- notification.close_mr(merge_request)
+ notification.close_mr(merge_request, @u_disabled)
end
def should_email(user_id)