diff options
author | Nick Thomas <nick@gitlab.com> | 2016-08-16 17:08:43 +0100 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2016-08-16 17:08:43 +0100 |
commit | 0e9c4a902d7985d917fac1f833c9544133f83a95 (patch) | |
tree | aaca0b1902216b3d43973bf562d7d3eb01b1edb4 /spec/services/merge_requests | |
parent | b62954db4c40df435363994ce4632632fde01455 (diff) | |
download | gitlab-ce-0e9c4a902d7985d917fac1f833c9544133f83a95.tar.gz |
DRY up the added update service specs, add two email helpers
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r-- | spec/services/merge_requests/update_service_spec.rb | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb index 86d78f8c898..6dfeb581975 100644 --- a/spec/services/merge_requests/update_service_spec.rb +++ b/spec/services/merge_requests/update_service_spec.rb @@ -226,37 +226,9 @@ describe MergeRequests::UpdateService, services: true do end end - context 'updated user mentions' do - let(:user4) { create(:user) } - before do - project.team << [user4, :developer] - end - - context 'in title' do - before do - perform_enqueued_jobs { update_merge_request(title: user4.to_reference) } - end - - it 'emails only the newly-mentioned user' do - should_not_email(user) - should_not_email(user2) - should_not_email(user3) - should_email(user4) - end - end - - context 'in description' do - before do - perform_enqueued_jobs { update_merge_request(description: user4.to_reference) } - end - - it 'emails only the newly-mentioned user' do - should_not_email(user) - should_not_email(user2) - should_not_email(user3) - should_email(user4) - end - end + context 'updating mentions' do + let(:mentionable) { merge_request } + include_examples 'updating mentions', MergeRequests::UpdateService end context 'when MergeRequest has tasks' do |