Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 19 deletions

diff --git a/spec/workers/bulk_imports/relation_export_worker_spec.rb b/spec/workers/bulk_imports/relation_export_worker_spec.rb
index f91db0388a4..646af6c2a9c 100644
--- a/spec/workers/bulk_imports/relation_export_worker_spec.rb
+++ b/spec/workers/bulk_imports/relation_export_worker_spec.rb
@@ -47,28 +47,14 @@ RSpec.describe BulkImports::RelationExportWorker, feature_category: :importers d
       context 'when export is batched' do
         let(:batched) { true }
 
-        context 'when bulk_imports_batched_import_export feature flag is disabled' do
-          before do
-            stub_feature_flags(bulk_imports_batched_import_export: false)
-          end
-
-          include_examples 'export service', BulkImports::RelationExportService
+        context 'when relation is batchable' do
+          include_examples 'export service', BulkImports::BatchedRelationExportService
         end
 
-        context 'when bulk_imports_batched_import_export feature flag is enabled' do
-          before do
-            stub_feature_flags(bulk_imports_batched_import_export: true)
-          end
-
-          context 'when relation is batchable' do
-            include_examples 'export service', BulkImports::BatchedRelationExportService
-          end
+        context 'when relation is not batchable' do
+          let(:relation) { 'namespace_settings' }
 
-          context 'when relation is not batchable' do
-            let(:relation) { 'namespace_settings' }
-
-            include_examples 'export service', BulkImports::RelationExportService
-          end
+          include_examples 'export service', BulkImports::RelationExportService
         end
       end