summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/update_service_spec.rb
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-10-10 08:35:31 +0200
committerJarka Kadlecova <jarka@gitlab.com>2017-10-10 12:28:13 +0200
commit616d1e10717c40e1a4777378ee8e520e2e6595b8 (patch)
tree9c7c3c31b94b9232c84c30b1cf213d15d724b5ee /spec/services/merge_requests/update_service_spec.rb
parent100a7c6b982d196b1f5570a8e47591015b5d638d (diff)
downloadgitlab-ce-616d1e10717c40e1a4777378ee8e520e2e6595b8.tar.gz
Fix text for the merge request lock system note
Diffstat (limited to 'spec/services/merge_requests/update_service_spec.rb')
-rw-r--r--spec/services/merge_requests/update_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 7257c359a7e..98409be4236 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -127,10 +127,10 @@ describe MergeRequests::UpdateService, :mailer do
end
it 'creates system note about discussion lock' do
- note = find_note('locked this issue')
+ note = find_note('locked this merge request')
expect(note).not_to be_nil
- expect(note.note).to eq 'locked this issue'
+ expect(note.note).to eq 'locked this merge request'
end
context 'when not including source branch removal options' do