Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 12 insertions, 2 deletions

diff --git a/spec/requests/api/project_export_spec.rb b/spec/requests/api/project_export_spec.rb
index fdd76c63069..096f0b73b4c 100644
--- a/spec/requests/api/project_export_spec.rb
+++ b/spec/requests/api/project_export_spec.rb
@@ -511,6 +511,10 @@ RSpec.describe API::ProjectExport, :clean_gitlab_redis_cache, feature_category:
 
     let_it_be(:status_path) { "/projects/#{project.id}/export_relations/status" }
 
+    before do
+      stub_application_setting(bulk_import_enabled: true)
+    end
+
     context 'when user is a maintainer' do
       before do
         project.add_maintainer(user)
@@ -584,9 +588,9 @@ RSpec.describe API::ProjectExport, :clean_gitlab_redis_cache, feature_category:
         end
       end
 
-      context 'with bulk_import FF disabled' do
+      context 'with bulk_import is disabled' do
         before do
-          stub_feature_flags(bulk_import: false)
+          stub_application_setting(bulk_import_enabled: false)
         end
 
         describe 'POST /projects/:id/export_relations' do
@@ -641,5 +645,11 @@ RSpec.describe API::ProjectExport, :clean_gitlab_redis_cache, feature_category:
         end
       end
     end
+
+    context 'when bulk import is disabled' do
+      it_behaves_like '404 response' do
+        let(:request) { get api(path, user) }
+      end
+    end
   end
 end