diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 09:07:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 09:07:45 +0300 |
commit | 6047d21a899cba25dfb554cca1776fed689dc951 (patch) | |
tree | afc5785b2deb50393df933546c090f6568b38fe8 /spec/controllers/projects | |
parent | 9d01bd9d462eccffda96e5dcc1caeb8b86e0efe8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r-- | spec/controllers/projects/merge_requests/diffs_controller_spec.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb index a0818601562..707d074b5c1 100644 --- a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb @@ -472,8 +472,6 @@ RSpec.describe Projects::MergeRequests::DiffsController do diff_view: :inline, merge_ref_head_diff: nil, pagination_data: { - current_page: nil, - next_page: nil, total_pages: nil }.merge(pagination_data) } @@ -515,7 +513,7 @@ RSpec.describe Projects::MergeRequests::DiffsController do it_behaves_like 'serializes diffs with expected arguments' do let(:collection) { Gitlab::Diff::FileCollection::MergeRequestDiffBatch } - let(:expected_options) { collection_arguments(current_page: nil, total_pages: 20).merge(merge_ref_head_diff: false) } + let(:expected_options) { collection_arguments(total_pages: 20).merge(merge_ref_head_diff: false) } end it_behaves_like 'successful request' @@ -555,7 +553,7 @@ RSpec.describe Projects::MergeRequests::DiffsController do it_behaves_like 'serializes diffs with expected arguments' do let(:collection) { Gitlab::Diff::FileCollection::MergeRequestDiffBatch } let(:expected_options) do - collection_arguments(current_page: nil, total_pages: 20) + collection_arguments(total_pages: 20) end end @@ -574,7 +572,7 @@ RSpec.describe Projects::MergeRequests::DiffsController do it_behaves_like 'serializes diffs with expected arguments' do let(:collection) { Gitlab::Diff::FileCollection::MergeRequestDiffBatch } - let(:expected_options) { collection_arguments(current_page: nil, total_pages: 20) } + let(:expected_options) { collection_arguments(total_pages: 20) } end it_behaves_like 'successful request' @@ -585,7 +583,7 @@ RSpec.describe Projects::MergeRequests::DiffsController do it_behaves_like 'serializes diffs with expected arguments' do let(:collection) { Gitlab::Diff::FileCollection::MergeRequestDiffBatch } - let(:expected_options) { collection_arguments(current_page: nil, next_page: nil, total_pages: 20) } + let(:expected_options) { collection_arguments(total_pages: 20) } end it_behaves_like 'successful request' |