summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-25 18:48:15 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-25 18:48:15 +0200
commitf9ece12e872e9bf748f4daebfba88c341d4046f5 (patch)
treef2c0bc7ca5ea4b27e9823abf47098d92afc17d67 /features
parentaadfb3665f39e5886254bac856ebd1cc47f8c652 (diff)
parent6428698580d9554983209b6e43c1ce9b201f717d (diff)
downloadgitlab-ce-f9ece12e872e9bf748f4daebfba88c341d4046f5.tar.gz
Merge branch 'master' into oauth2_provider
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/nav/_profile.html.haml
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/commits/commits.rb6
-rw-r--r--features/steps/project/merge_requests.rb6
2 files changed, 8 insertions, 4 deletions
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index 935f313e298..d515ee1ac11 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -78,14 +78,14 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
end
step 'I click side-by-side diff button' do
- click_link "Side-by-side Diff"
+ click_link "Side-by-side"
end
step 'I see side-by-side diff button' do
- page.should have_content "Side-by-side Diff"
+ page.should have_content "Side-by-side"
end
step 'I see inline diff button' do
- page.should have_content "Inline Diff"
+ page.should have_content "Inline"
end
end
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index b00f610cfae..28928d602d6 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -109,6 +109,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I click on the commit in the merge request' do
+ within '.merge-request-tabs' do
+ click_link 'Commits'
+ end
+
within '.mr-commits' do
click_link Commit.truncate_sha(sample_commit.id)
end
@@ -261,7 +265,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I click Side-by-side Diff tab' do
- click_link 'Side-by-side Diff'
+ click_link 'Side-by-side'
end
step 'I should see comments on the side-by-side diff page' do