summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-14 12:52:33 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-14 12:52:33 +0200
commitc26b001ebcf43c3bdc18d1afcfbafa87b0b18366 (patch)
tree2c6ab8c1077a53863645dd2bdeb1a9352eb60486 /spec
parentae6d0aaae0d8f6251b30a8e5243a98f083f0cac9 (diff)
downloadgitlab-ce-c26b001ebcf43c3bdc18d1afcfbafa87b0b18366.tar.gz
Set EmailsOnPush reply-to address to committer email when enabled.emailsonpush-replyto
Diffstat (limited to 'spec')
-rw-r--r--spec/mailers/notify_spec.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 6bea0321cb9..b297fbd5119 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -725,6 +725,11 @@ describe Notify do
sender = subject.header[:from].addrs[0]
expect(sender.address).to eq(user.email)
end
+
+ it "is set to reply to the committer email" do
+ sender = subject.header[:reply_to].addrs[0]
+ expect(sender.address).to eq(user.email)
+ end
end
context "when the committer email domain is not completely within the GitLab domain" do
@@ -738,6 +743,11 @@ describe Notify do
sender = subject.header[:from].addrs[0]
expect(sender.address).to eq(gitlab_sender)
end
+
+ it "is set to reply to the default email" do
+ sender = subject.header[:reply_to].addrs[0]
+ expect(sender.address).to eq(gitlab_sender_reply_to)
+ end
end
context "when the committer email domain is outside the GitLab domain" do
@@ -751,6 +761,11 @@ describe Notify do
sender = subject.header[:from].addrs[0]
expect(sender.address).to eq(gitlab_sender)
end
+
+ it "is set to reply to the default email" do
+ sender = subject.header[:reply_to].addrs[0]
+ expect(sender.address).to eq(gitlab_sender_reply_to)
+ end
end
end
end