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 /features | |
parent | d0c0c75ca9568bc3ec00c341a6053623d85e6201 (diff) | |
download | gitlab-ce-6df22f72c6c312199c547e017ce1f947cf88e34c.tar.gz |
Rephrase some system notes to be compatible with new system note stylerephrase-system-notes
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/project/merge_requests.rb | 2 | ||||
-rw-r--r-- | features/steps/shared/issuable.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index f728d243cdc..d2fa8cd39af 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -515,7 +515,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I should see new target branch changes' do expect(page).to have_content 'Request to merge fix into feature' - expect(page).to have_content 'Target branch changed from merge-test to feature' + expect(page).to have_content 'changed target branch from merge-test to feature' wait_for_ajax end diff --git a/features/steps/shared/issuable.rb b/features/steps/shared/issuable.rb index df9845ba569..aa666a954bc 100644 --- a/features/steps/shared/issuable.rb +++ b/features/steps/shared/issuable.rb @@ -179,7 +179,7 @@ module SharedIssuable project = Project.find_by(name: from_project_name) expect(page).to have_content(user_name) - expect(page).to have_content("Mentioned in #{issuable.class.to_s.titleize.downcase} #{issuable.to_reference(project)}") + expect(page).to have_content("mentioned in #{issuable.class.to_s.titleize.downcase} #{issuable.to_reference(project)}") end def expect_sidebar_content(content) |