diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-21 10:55:54 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-21 11:04:36 +0100 |
| commit | bd3ae192bb62d522912281b5943073f6ad444fe4 (patch) | |
| tree | b2fbee25011f0c63071718d38f6612690c88ac57 /spec/services/system_note_service_spec.rb | |
| parent | 01f238893aaf8f5aa24eec7e33edc479d4e1315d (diff) | |
| download | gitlab-ce-bd3ae192bb62d522912281b5943073f6ad444fe4.tar.gz | |
Rename MWPS in system notes and related tests
Diffstat (limited to 'spec/services/system_note_service_spec.rb')
| -rw-r--r-- | spec/services/system_note_service_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index 56d39e9a005..7f0da4bf03c 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -225,8 +225,8 @@ describe SystemNoteService, services: true do it_behaves_like 'a system note' - it "posts the Merge When Build Succeeds system note" do - expect(subject.note).to match /Enabled an automatic merge when the build for (\w+\/\w+@)?[0-9a-f]{40} succeeds/ + it "posts the 'merge when pipeline succeeds' system note" do + expect(subject.note).to match /Enabled an automatic merge when the pipeline for (\w+\/\w+@)?[0-9a-f]{40} succeeds/ end end @@ -239,7 +239,7 @@ describe SystemNoteService, services: true do it_behaves_like 'a system note' - it "posts the Merge When Build Succeeds system note" do + it "posts the 'merge when pipeline succeeds' system note" do expect(subject.note).to eq "Canceled the automatic merge" end end |