Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 7 deletions

diff --git a/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb b/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb
index 3088129a732..b8d18718dfb 100644
--- a/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb
+++ b/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb
@@ -212,12 +212,6 @@ RSpec.describe Gitlab::ImportExport::Json::StreamingSerializer do
     end
   end
 
-  describe '.batch_size' do
-    it 'returns default batch size' do
-      expect(described_class.batch_size(exportable)).to eq(described_class::BATCH_SIZE)
-    end
-  end
-
   describe '#serialize_relation' do
     context 'when record is a merge request' do
       let(:json_writer) do
diff --git a/spec/lib/gitlab/import_export/legacy_relation_tree_saver_spec.rb b/spec/lib/gitlab/import_export/legacy_relation_tree_saver_spec.rb
index 0d372def8b0..c2c50751c3f 100644
--- a/spec/lib/gitlab/import_export/legacy_relation_tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/legacy_relation_tree_saver_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Gitlab::ImportExport::LegacyRelationTreeSaver do
     it 'uses FastHashSerializer' do
       expect(Gitlab::ImportExport::FastHashSerializer)
         .to receive(:new)
-        .with(exportable, tree, batch_size: Gitlab::ImportExport::Json::StreamingSerializer::BATCH_SIZE)
+        .with(exportable, tree)
         .and_return(serializer)
 
       expect(serializer).to receive(:execute)