summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/merge_service_spec.rb
diff options
context:
space:
mode:
authortiagonbotelho <tiagonbotelho@hotmail.com>2016-08-01 16:00:44 +0100
committertiagonbotelho <tiagonbotelho@hotmail.com>2016-08-09 15:11:39 +0100
commit1d268a89deef10854193db48d65cf5d519a0363d (patch)
tree59765b4a2f83b453875fa7aefe9b7ab5c65e3c67 /spec/services/merge_requests/merge_service_spec.rb
parent519275c1102ad8a1d56f5807de2d8a1ae4b21dc0 (diff)
downloadgitlab-ce-1d268a89deef10854193db48d65cf5d519a0363d.tar.gz
adds second batch of tests changed to active tenseactive-tense-test-coverage
Diffstat (limited to 'spec/services/merge_requests/merge_service_spec.rb')
-rw-r--r--spec/services/merge_requests/merge_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index 8ffebcac698..159f6817e8d 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -26,13 +26,13 @@ describe MergeRequests::MergeService, services: true do
it { expect(merge_request).to be_valid }
it { expect(merge_request).to be_merged }
- it 'should send email to user2 about merge of new merge_request' do
+ it 'sends email to user2 about merge of new merge_request' do
email = ActionMailer::Base.deliveries.last
expect(email.to.first).to eq(user2.email)
expect(email.subject).to include(merge_request.title)
end
- it 'should create system note about merge_request merge' do
+ it 'creates system note about merge_request merge' do
note = merge_request.notes.last
expect(note.note).to include 'Status changed to merged'
end