diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-28 13:24:01 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-28 13:24:01 +0200 |
commit | 63e6f055f12a5f955ae3bb7f27b562f89efbd8bb (patch) | |
tree | b7fab87865bfdfbd70d603e432e0f7ce749414dc /spec/mailers | |
parent | 2f585840dbf4910d3a4b40c1771ff1dd4525625d (diff) | |
download | gitlab-ce-63e6f055f12a5f955ae3bb7f27b562f89efbd8bb.tar.gz |
Fix notify specs. Fix merge request close via api
Diffstat (limited to 'spec/mailers')
-rw-r--r-- | spec/mailers/notify_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index 7867c4dd78e..472458e8691 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -107,7 +107,7 @@ describe Notify do let(:issue) { create(:issue, assignee: assignee, project: project ) } describe 'that are new' do - subject { Notify.new_issue_email(issue.id) } + subject { Notify.new_issue_email(issue.assignee_id, issue.id) } it_behaves_like 'an assignee email' @@ -172,7 +172,7 @@ describe Notify do let(:merge_request) { create(:merge_request, assignee: assignee, project: project) } describe 'that are new' do - subject { Notify.new_merge_request_email(merge_request.id) } + subject { Notify.new_merge_request_email(merge_request.assignee_id, merge_request.id) } it_behaves_like 'an assignee email' |