summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2016-10-16 18:38:35 +0100
committerValery Sizov <valery@gitlab.com>2016-10-17 13:29:45 +0300
commitaa76fa55f7ab2dfd1ecc3df5737d6b5f48ed5759 (patch)
tree33c189c4f25ec0302b5c895682b7eaad4a6b4552 /features
parent8a5d3ce15d071491cc2177a4f317dc82c02e0d1d (diff)
downloadgitlab-ce-aa76fa55f7ab2dfd1ecc3df5737d6b5f48ed5759.tar.gz
Remove carriage returns from commit description as summary is on a newline and will always include carriage returns
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/commits/commits.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index b08912de25f..c2a15c1a19a 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -21,7 +21,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
expect(response_headers['Content-Type']).to have_content("application/atom+xml")
expect(body).to have_selector("title", text: "#{@project.name}:master commits")
expect(body).to have_selector("author email", text: commit.author_email)
- expect(body).to have_selector("entry summary", text: commit.description[0..10])
+ expect(body).to have_selector("entry summary", text: commit.description[0..10].gsub("\r", ""))
end
step 'I click on tag link' do