Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
0145e8ea21
commit
c2a9e6ea67
|
@ -136,7 +136,7 @@ $kbd-bg: #333;
|
|||
//== Buttons
|
||||
//
|
||||
//##
|
||||
$btn-default-color: #7f8fa4;
|
||||
$btn-default-color: $gl-text-color;
|
||||
$btn-default-bg: #fff;
|
||||
$btn-default-border: #e7e9ed;
|
||||
|
||||
|
|
|
@ -137,7 +137,7 @@ module DiffHelper
|
|||
# Always use HTML to handle case where JSON diff rendered this button
|
||||
params_copy.delete(:format)
|
||||
|
||||
link_to url_for(params_copy), id: "commit-diff-viewtype", class: (params[:view] != 'parallel' ? 'btn btn-sm active' : 'btn btn-sm') do
|
||||
link_to url_for(params_copy), id: "inline-diff-btn", class: (params[:view] != 'parallel' ? 'btn btn-sm active' : 'btn btn-sm') do
|
||||
'Inline'
|
||||
end
|
||||
end
|
||||
|
@ -148,7 +148,7 @@ module DiffHelper
|
|||
# Always use HTML to handle case where JSON diff rendered this button
|
||||
params_copy.delete(:format)
|
||||
|
||||
link_to url_for(params_copy), id: "commit-diff-viewtype", class: (params[:view] == 'parallel' ? 'btn active btn-sm' : 'btn btn-sm') do
|
||||
link_to url_for(params_copy), id: "parallel-diff-btn", class: (params[:view] == 'parallel' ? 'btn active btn-sm' : 'btn btn-sm') do
|
||||
'Side-by-side'
|
||||
end
|
||||
end
|
||||
|
|
|
@ -225,13 +225,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
|
|||
|
||||
step 'I click link "Hide inline discussion" of the second file' do
|
||||
page.within '.files [id^=diff]:nth-child(2)' do
|
||||
find('.js-toggle-diff-comments').click
|
||||
find('.js-toggle-diff-comments').trigger('click')
|
||||
end
|
||||
end
|
||||
|
||||
step 'I click link "Show inline discussion" of the second file' do
|
||||
page.within '.files [id^=diff]:nth-child(2)' do
|
||||
find('.js-toggle-diff-comments').click
|
||||
find('.js-toggle-diff-comments').trigger('click')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -198,7 +198,7 @@ module SharedDiffNote
|
|||
end
|
||||
|
||||
step 'I click side-by-side diff button' do
|
||||
click_link "Side-by-side"
|
||||
find('#parallel-diff-btn').trigger('click')
|
||||
end
|
||||
|
||||
step 'I see side-by-side diff button' do
|
||||
|
|
Loading…
Reference in New Issue