diff options
author | Robb Kidd <robb@thekidds.org> | 2012-05-14 23:42:47 -0400 |
---|---|---|
committer | Robb Kidd <robb@thekidds.org> | 2012-05-15 22:37:33 -0400 |
commit | 5fe75649b3e278562b241abadb7d5a62146cff34 (patch) | |
tree | f9f2c2047854cb349544b47f5167fb02d2786685 /spec/mailers | |
parent | dd921053c8ef598bad3c7a16331c296d581f0080 (diff) | |
download | gitlab-ce-5fe75649b3e278562b241abadb7d5a62146cff34.tar.gz |
Rename changed_mr_email to reassigned_mr_email & make resque friendly
#changed_merge_request_email was really sending emails about merge
request reassignments. Updated method name to reflect that.
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
Diffstat (limited to 'spec/mailers')
-rw-r--r-- | spec/mailers/notify_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index 8c896085226..7211f121239 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -123,9 +123,9 @@ describe Notify do end describe 'that are reassigned' do - before(:each) { merge_request.stub(:assignee_id_was).and_return(old_assignee.id) } + before(:each) { merge_request.stub(:assignee_id_was).and_return(previous_assignee.id) } - subject { Notify.changed_merge_request_email(recipient, merge_request) } + subject { Notify.reassigned_merge_request_email(recipient.id, merge_request.id, previous_assignee.id) } it_behaves_like 'a multiple recipients email' @@ -134,7 +134,7 @@ describe Notify do end it 'contains the name of the previous assignee' do - should have_body_text /#{old_assignee.name}/ + should have_body_text /#{previous_assignee.name}/ end it 'contains the name of the new assignee' do |