summaryrefslogtreecommitdiff
path: root/spec/mailers
diff options
context:
space:
mode:
authorRobb Kidd <robb@thekidds.org>2012-05-15 19:41:37 -0400
committerRobb Kidd <robb@thekidds.org>2012-05-15 22:37:34 -0400
commite660043d22bd686f6799a46b506a4c2ad53e46fa (patch)
tree5ee872899cfe68bb389d57d12826f6bf92b872ad /spec/mailers
parent39061af9f8f19d114b48f79a66c22116a52e57be (diff)
downloadgitlab-ce-e660043d22bd686f6799a46b506a4c2ad53e46fa.tar.gz
Make Notify#new_merge_request_email resque friendly.
Diffstat (limited to 'spec/mailers')
-rw-r--r--spec/mailers/notify_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 40a51437908..065094e964e 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -101,7 +101,7 @@ describe Notify do
let(:merge_request) { Factory.create(:merge_request, :assignee => assignee, :project => project) }
describe 'that are new' do
- subject { Notify.new_merge_request_email(merge_request) }
+ subject { Notify.new_merge_request_email(merge_request.id) }
it_behaves_like 'an assignee email'