diff options
author | Jonathan A. Sternberg <jonathansternberg@gmail.com> | 2014-04-10 12:41:20 -0400 |
---|---|---|
committer | Jonathan A. Sternberg <jonathansternberg@gmail.com> | 2014-04-11 11:54:02 -0400 |
commit | 9cb2a4ac8abfe27ecbf1133aec7b29604f20c248 (patch) | |
tree | 6d06a22b796bc9b09aeefab4458c45e4bed01579 /spec/mailers | |
parent | 415c0f4bbe12dbd78bf24d50e66e3092df07fa21 (diff) | |
download | gitlab-ce-9cb2a4ac8abfe27ecbf1133aec7b29604f20c248.tar.gz |
Fix emails on push service when a single commit is pushed
This fixes issue #161.
Diffstat (limited to 'spec/mailers')
-rw-r--r-- | spec/mailers/notify_spec.rb | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index 22d60429ccd..e86a60a42b5 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -502,7 +502,7 @@ describe Notify do end end - describe 'email on push' do + describe 'email on push with multiple commits' do let(:example_site_path) { root_path } let(:user) { create(:user) } let(:compare) { Gitlab::Git::Compare.new(project.repository.raw_repository, 'cd5c4bac', 'b1e6a9db') } @@ -537,4 +537,40 @@ describe Notify do should have_body_text /#{diff_path}/ end end + + describe 'email on push with a single commit' do + let(:example_site_path) { root_path } + let(:user) { create(:user) } + let(:compare) { Gitlab::Git::Compare.new(project.repository.raw_repository, '8716fc78', 'b1e6a9db') } + let(:commits) { Commit.decorate(compare.commits) } + let(:diff_path) { project_commit_path(project, commits.first) } + + subject { Notify.repository_push_email(project.id, 'devs@company.name', user.id, 'master', compare) } + + it 'is sent as the author' do + sender = subject.header[:from].addrs[0] + sender.display_name.should eq(user.name) + sender.address.should eq(gitlab_sender) + end + + it 'is sent to recipient' do + should deliver_to 'devs@company.name' + end + + it 'has the correct subject' do + should have_subject /New push to repository/ + end + + it 'includes commits list' do + should have_body_text /tree css fixes/ + end + + it 'includes diffs' do + should have_body_text /Checkout wiki pages for installation information/ + end + + it 'contains a link to the diff' do + should have_body_text /#{diff_path}/ + end + end end |