diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /spec/features/expand_collapse_diffs_spec.rb | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'spec/features/expand_collapse_diffs_spec.rb')
-rw-r--r-- | spec/features/expand_collapse_diffs_spec.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/spec/features/expand_collapse_diffs_spec.rb b/spec/features/expand_collapse_diffs_spec.rb index 55bdf4c244e..cbd1ae628d1 100644 --- a/spec/features/expand_collapse_diffs_spec.rb +++ b/spec/features/expand_collapse_diffs_spec.rb @@ -17,7 +17,6 @@ RSpec.describe 'Expand and collapse diffs', :js do # Ensure that undiffable.md is in .gitattributes project.repository.copy_gitattributes(branch) visit project_commit_path(project, project.commit(branch)) - execute_script('window.ajaxUris = []; $(document).ajaxSend(function(event, xhr, settings) { ajaxUris.push(settings.url) });') end def file_container(filename) @@ -191,10 +190,6 @@ RSpec.describe 'Expand and collapse diffs', :js do expect(small_diff).to have_selector('.code') expect(small_diff).not_to have_selector('.nothing-here-block') end - - it 'does not make a new HTTP request' do - expect(evaluate_script('ajaxUris')).not_to include(a_string_matching('small_diff.md')) - end end end @@ -264,7 +259,6 @@ RSpec.describe 'Expand and collapse diffs', :js do find('.note-textarea') wait_for_requests - execute_script('window.ajaxUris = []; $(document).ajaxSend(function(event, xhr, settings) { ajaxUris.push(settings.url) });') end it 'reloads the page with all diffs expanded' do @@ -300,10 +294,6 @@ RSpec.describe 'Expand and collapse diffs', :js do expect(small_diff).to have_selector('.code') expect(small_diff).not_to have_selector('.nothing-here-block') end - - it 'does not make a new HTTP request' do - expect(evaluate_script('ajaxUris')).not_to include(a_string_matching('small_diff.md')) - end end end end |