summaryrefslogtreecommitdiff
path: root/spec/mailers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-01 16:28:10 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-01 16:28:10 +0200
commit63bbe42c9cc5c23e090849022df60b2e45ee35d5 (patch)
tree95be812f6298499ed0f5fb8c160f06c7ca472ebe /spec/mailers
parent73520b4307a70f948acca586a9df56c9618feba6 (diff)
parent2e92600b30b4e935fb8ba125d99124539545d901 (diff)
downloadgitlab-ce-63bbe42c9cc5c23e090849022df60b2e45ee35d5.tar.gz
Merge branch 'stanhu/gitlab-ce-fix-message-id-notify'
Diffstat (limited to 'spec/mailers')
-rw-r--r--spec/mailers/notify_spec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 42481a9ea38..cb67ec95d57 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -52,6 +52,7 @@ describe Notify do
end
it 'has headers that reference an existing thread' do
+ is_expected.to have_header 'Message-ID', /<(.*)@#{Gitlab.config.gitlab.host}>/
is_expected.to have_header 'References', /<#{thread_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
is_expected.to have_header 'In-Reply-To', /<#{thread_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
is_expected.to have_header 'X-GitLab-Project', /#{project.name}/