summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-24 10:15:13 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-24 10:15:13 +0000
commitb0ed2ff1a69df384a1cb9a184c0528bec1986827 (patch)
treebc3bfb310f541b9f8cb45724282085f87b586b1a /features
parent160799ca9b6d6e1695521444d787da78b93feef8 (diff)
parenta12d50c5e5ebba17e6e16d3d628f449caf24b6d2 (diff)
downloadgitlab-ce-b0ed2ff1a69df384a1cb9a184c0528bec1986827.tar.gz
Merge branch 'atom-feeds-everywhere' into 'master'
Add project activity atom feed and show atom feed buttons everywhere where applicable. See merge request !555
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 57b727f837e..30b1934b363 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -18,7 +18,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
step 'I see commits atom feed' do
commit = @project.repository.commit
response_headers['Content-Type'].should have_content("application/atom+xml")
- body.should have_selector("title", text: "Recent commits to #{@project.name}")
+ body.should have_selector("title", text: "#{@project.name}:master commits")
body.should have_selector("author email", text: commit.author_email)
body.should have_selector("entry summary", text: commit.description[0..10])
end