1 files changed, 26 insertions, 2 deletions
diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index 96a50b26871..c5c5af3cb01 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -135,10 +135,22 @@ RSpec.describe Projects::CreateService, '#execute' do
       create_project(user, opts)
     end
 
-    it 'builds associated project settings' do
+    it 'creates associated project settings' do
       project = create_project(user, opts)
 
-      expect(project.project_setting).to be_new_record
+      expect(project.project_setting).to be_persisted
+    end
+
+    context 'create_project_settings feature flag is disabled' do
+      before do
+        stub_feature_flags(create_project_settings: false)
+      end
+
+      it 'builds associated project settings' do
+        project = create_project(user, opts)
+
+        expect(project.project_setting).to be_new_record
+      end
     end
 
     it_behaves_like 'storing arguments in the application context' do
@@ -376,6 +388,18 @@ RSpec.describe Projects::CreateService, '#execute' do
 
       imported_project
     end
+
+    describe 'import scheduling' do
+      context 'when project import type is gitlab project migration' do
+        it 'does not schedule project import' do
+          opts[:import_type] = 'gitlab_project_migration'
+
+          project = create_project(user, opts)
+
+          expect(project.import_state.status).to eq('none')
+        end
+      end
+    end
   end
 
   context 'builds_enabled global setting' do