summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-11-25 04:36:13 +0000
committerRobert Speicher <robert@gitlab.com>2016-11-25 04:36:13 +0000
commitfe4ae12ec8bf82f0a6f10508f6650675deefe687 (patch)
treef6f08e3624798f0e773809fc3a42ab05b7db904c /features
parent40fa5604f38409f12d709c425286a6047d2c8e06 (diff)
parent6df22f72c6c312199c547e017ce1f947cf88e34c (diff)
downloadgitlab-ce-fe4ae12ec8bf82f0a6f10508f6650675deefe687.tar.gz
Merge branch 'rephrase-system-notes' into 'master'
Rephrase some system notes to be compatible with new system note style See merge request !7692
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests.rb2
-rw-r--r--features/steps/shared/issuable.rb2
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)