diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/controllers/projects/merge_requests/diffs_controller_spec.rb | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/controllers/projects/merge_requests/diffs_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/merge_requests/diffs_controller_spec.rb | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb index 217447c2ad6..91770a00081 100644 --- a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb @@ -58,39 +58,6 @@ RSpec.describe Projects::MergeRequests::DiffsController do end end - shared_examples 'persisted preferred diff view cookie' do - context 'with view param' do - before do - go(view: 'parallel') - end - - it 'saves the preferred diff view in a cookie' do - expect(response.cookies['diff_view']).to eq('parallel') - end - - it 'only renders the required view', :aggregate_failures do - diff_files_without_deletions = json_response['diff_files'].reject { |f| f['deleted_file'] } - have_no_inline_diff_lines = satisfy('have no inline diff lines') do |diff_file| - !diff_file.has_key?('highlighted_diff_lines') - end - - expect(diff_files_without_deletions).to all(have_key('parallel_diff_lines')) - expect(diff_files_without_deletions).to all(have_no_inline_diff_lines) - end - end - - context 'when the user cannot view the merge request' do - before do - project.team.truncate - go - end - - it 'returns a 404' do - expect(response).to have_gitlab_http_status(:not_found) - end - end - end - shared_examples "diff note on-demand position creation" do it "updates diff discussion positions" do service = double("service") @@ -155,7 +122,6 @@ RSpec.describe Projects::MergeRequests::DiffsController do it_behaves_like 'forked project with submodules' end - it_behaves_like 'persisted preferred diff view cookie' it_behaves_like 'cached diff collection' it_behaves_like 'diff note on-demand position creation' end @@ -414,6 +380,7 @@ RSpec.describe Projects::MergeRequests::DiffsController do def collection_arguments(pagination_data = {}) { + environment: nil, merge_request: merge_request, diff_view: :inline, pagination_data: { @@ -439,18 +406,6 @@ RSpec.describe Projects::MergeRequests::DiffsController do it_behaves_like '404 for unexistent diffable' - context 'when feature is disabled' do - before do - stub_feature_flags(diffs_batch_load: false) - end - - it 'returns 404' do - go - - expect(response).to have_gitlab_http_status(:not_found) - end - end - context 'when not authorized' do let(:other_user) { create(:user) } @@ -522,7 +477,6 @@ RSpec.describe Projects::MergeRequests::DiffsController do end it_behaves_like 'forked project with submodules' - it_behaves_like 'persisted preferred diff view cookie' it_behaves_like 'cached diff collection' context 'diff unfolding' do |