summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-03 22:25:52 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-03 22:25:52 +0200
commit858675ff8a98c3b824dd49cc9b08589a198cc34f (patch)
treee4fb7534eb0d839fe45acb7e4c044379f5c39401 /features
parentc2a9e6ea6716e6b16a1cc83dccb0dba7cf629814 (diff)
downloadgitlab-ce-858675ff8a98c3b824dd49cc9b08589a198cc34f.tar.gz
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 7191aa0e030..c92998631ff 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -128,7 +128,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I should see the proper Inline and Side-by-side links' do
- expect(page).to have_css('#commit-diff-viewtype', count: 2)
+ expect(page).to have_css('#parallel-diff-btn', count: 1)
+ expect(page).to have_css('#inline-diff-btn', count: 1)
end
step 'I switch to the merge request\'s comments tab' do