Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 8 deletions

diff --git a/spec/serializers/paginated_diff_entity_spec.rb b/spec/serializers/paginated_diff_entity_spec.rb
index a8ac89a8481..732a77ef604 100644
--- a/spec/serializers/paginated_diff_entity_spec.rb
+++ b/spec/serializers/paginated_diff_entity_spec.rb
@@ -19,20 +19,16 @@ RSpec.describe PaginatedDiffEntity do
 
   subject { entity.as_json }
 
-  before do
-    stub_feature_flags(diffs_gradual_load: false)
-  end
-
   it 'exposes diff_files' do
     expect(subject[:diff_files]).to be_present
   end
 
   it 'exposes pagination data' do
     expect(subject[:pagination]).to eq(
-      current_page: 2,
-      next_page: 3,
-      next_page_href: "/#{merge_request.project.full_path}/-/merge_requests/#{merge_request.iid}/diffs_batch.json?page=3",
-      total_pages: 7
+      current_page: nil,
+      next_page: nil,
+      next_page_href: nil,
+      total_pages: 20
     )
   end