Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
99e52c9ad0
commit
fca161f5c5
|
@ -41,7 +41,7 @@
|
|||
Discussion
|
||||
%span.badge= @merge_request.mr_and_commit_notes.count
|
||||
%li.commits-tab{data: {action: 'commits'}}
|
||||
= link_to project_merge_request_path(@project, @merge_request) do
|
||||
= link_to project_merge_request_path(@project, @merge_request), title: 'Commits' do
|
||||
%i.fa.fa-database
|
||||
Commits
|
||||
%span.badge= @commits.size
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue