diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-11-23 14:55:23 +0800 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-11-24 18:26:29 +0800 |
| commit | 6df22f72c6c312199c547e017ce1f947cf88e34c (patch) | |
| tree | c91130ad2d0bca231dd38d359c061a4227c778c0 /spec/features/merge_requests | |
| parent | d0c0c75ca9568bc3ec00c341a6053623d85e6201 (diff) | |
| download | gitlab-ce-rephrase-system-notes.tar.gz | |
Rephrase some system notes to be compatible with new system note stylerephrase-system-notes
Diffstat (limited to 'spec/features/merge_requests')
| -rw-r--r-- | spec/features/merge_requests/merge_when_build_succeeds_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb index 8eceaad2457..9ad225e3a1b 100644 --- a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb +++ b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb @@ -44,7 +44,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do expect(page).to have_content "The source branch will not be removed." visit_merge_request(merge_request) # Needed to refresh the page - expect(page).to have_content /Enabled an automatic merge when the build for [0-9a-f]{8} succeeds/i + expect(page).to have_content /enabled an automatic merge when the build for \h{8} succeeds/i end end end |