Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 26 deletions

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 db77bd338e1..958865f52a0 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
@@ -8,35 +8,17 @@ describe Gitlab::ImportExport::LegacyRelationTreeSaver do
   let(:tree) { {} }
 
   describe '#serialize' do
-    context 'when :export_fast_serialize feature is enabled' do
-      let(:serializer) { instance_double(Gitlab::ImportExport::FastHashSerializer) }
+    let(:serializer) { instance_double(Gitlab::ImportExport::FastHashSerializer) }
 
-      before do
-        stub_feature_flags(export_fast_serialize: true)
-      end
+    it 'uses FastHashSerializer' do
+      expect(Gitlab::ImportExport::FastHashSerializer)
+        .to receive(:new)
+        .with(exportable, tree)
+        .and_return(serializer)
 
-      it 'uses FastHashSerializer' do
-        expect(Gitlab::ImportExport::FastHashSerializer)
-          .to receive(:new)
-          .with(exportable, tree)
-          .and_return(serializer)
+      expect(serializer).to receive(:execute)
 
-        expect(serializer).to receive(:execute)
-
-        relation_tree_saver.serialize(exportable, tree)
-      end
-    end
-
-    context 'when :export_fast_serialize feature is disabled' do
-      before do
-        stub_feature_flags(export_fast_serialize: false)
-      end
-
-      it 'is serialized via built-in `as_json`' do
-        expect(exportable).to receive(:as_json).with(tree)
-
-        relation_tree_saver.serialize(exportable, tree)
-      end
+      relation_tree_saver.serialize(exportable, tree)
     end
   end
 end