summaryrefslogtreecommitdiff
path: root/spec/mailers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-22 15:40:48 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-22 15:40:48 +0300
commit0fcd89e3ac810bb137240edf86fac5b80d52faed (patch)
tree0d8b581d90863ea7767035b2f227a81e17c02299 /spec/mailers
parentd2aa48c0d5e49309b14baa5f2f792af945e74bb3 (diff)
downloadgitlab-ce-0fcd89e3ac810bb137240edf86fac5b80d52faed.tar.gz
Show iids for issues/mr in email subject
Diffstat (limited to 'spec/mailers')
-rw-r--r--spec/mailers/notify_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index a91bc9d75ad..7d6647e0983 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -110,7 +110,7 @@ describe Notify do
it_behaves_like 'an assignee email'
it 'has the correct subject' do
- should have_subject /#{project.name} \| new issue ##{issue.id} \| #{issue.title}/
+ should have_subject /#{project.name} \| new issue ##{issue.iid} \| #{issue.title}/
end
it 'contains a link to the new issue' do
@@ -126,7 +126,7 @@ describe Notify do
it_behaves_like 'a multiple recipients email'
it 'has the correct subject' do
- should have_subject /changed issue ##{issue.id} \| #{issue.title}/
+ should have_subject /changed issue ##{issue.iid} \| #{issue.title}/
end
it 'contains the name of the previous assignee' do
@@ -148,7 +148,7 @@ describe Notify do
subject { Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) }
it 'has the correct subject' do
- should have_subject /changed issue ##{issue.id} \| #{issue.title}/i
+ should have_subject /changed issue ##{issue.iid} \| #{issue.title}/i
end
it 'contains the new status' do
@@ -175,7 +175,7 @@ describe Notify do
it_behaves_like 'an assignee email'
it 'has the correct subject' do
- should have_subject /new merge request !#{merge_request.id}/
+ should have_subject /new merge request !#{merge_request.iid}/
end
it 'contains a link to the new merge request' do
@@ -199,7 +199,7 @@ describe Notify do
it_behaves_like 'a multiple recipients email'
it 'has the correct subject' do
- should have_subject /changed merge request !#{merge_request.id}/
+ should have_subject /changed merge request !#{merge_request.iid}/
end
it 'contains the name of the previous assignee' do