diff options
| author | Phil Hughes <me@iamphill.com> | 2019-01-24 17:48:03 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-01-24 17:48:03 +0300 |
| commit | 2f40aa68d92f3f51167aaccc9fab2801ee185605 (patch) | |
| tree | 54f8d590511170db8d7f4db6a16dda1830a9ec54 /spec/features/merge_request/user_views_diffs_spec.rb | |
| parent | da251c6436d6e17b18911d37c1b18314fb29329d (diff) | |
Added dropdown for diff settings
Dropdown includes buttons for tree view rendering mode
and buttons for the compare view (inline or side-by-side)
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55491
Diffstat (limited to 'spec/features/merge_request/user_views_diffs_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_views_diffs_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_views_diffs_spec.rb b/spec/features/merge_request/user_views_diffs_spec.rb index 7f95a1282f9..0434db04113 100644 --- a/spec/features/merge_request/user_views_diffs_spec.rb +++ b/spec/features/merge_request/user_views_diffs_spec.rb @@ -23,6 +23,8 @@ describe 'User views diffs', :js do end it 'shows diffs' do + find('.js-show-diff-settings').click + expect(page).to have_css('.tab-content #diffs.active') expect(page).to have_css('#parallel-diff-btn', count: 1) expect(page).to have_css('#inline-diff-btn', count: 1) @@ -38,6 +40,8 @@ describe 'User views diffs', :js do context 'when in the side-by-side view' do before do + find('.js-show-diff-settings').click + click_button 'Side-by-side' wait_for_requests |