Merge branch 'vzagorodny-fix-forks-dev-seeds' into 'master'

Fix broken development DB seeds for forks

Closes gitlab-foss#63471

See merge request gitlab-org/gitlab!16849

app/services/projects/fork_service.rb

@@ -51,7 +51,8 @@ module Projects
         # been instantiated to avoid ActiveRecord trying to create it when
         # initializing the project, as that would cause a foreign key constraint
         # exception.
-        relations_block:           -> (project) { build_fork_network_member(project) }
+        relations_block:           -> (project) { build_fork_network_member(project) },
+        skip_disk_validation:      skip_disk_validation
       }
 
       if @project.avatar.present? && @project.avatar.image?
@@ -110,6 +111,10 @@ module Projects
       @target_namespace ||= @params[:namespace] || current_user.namespace
     end
 
+    def skip_disk_validation
+      @skip_disk_validation ||= @params[:skip_disk_validation] || false
+    end
+
     def allowed_visibility_level
       target_level = [@project.visibility_level, target_namespace.visibility_level].min
 

db/fixtures/development/24_forks.rb

@@ -6,11 +6,16 @@ Sidekiq::Testing.inline! do
       source_project = Project.public_only.sample
 
       ##
-      # 04_project.rb might not have created a public project because
+      # 03_project.rb might not have created a public project because
       # we use randomized approach (e.g. `Array#sample`).
       return unless source_project
 
-      fork_project = Projects::ForkService.new(source_project, user, namespace: user.namespace).execute
+      fork_project = Projects::ForkService.new(
+        source_project,
+        user,
+        namespace: user.namespace,
+        skip_disk_validation: true
+      ).execute
 
       if fork_project.valid?
         print '.'

spec/services/projects/fork_service_spec.rb

@@ -119,6 +119,7 @@ describe Projects::ForkService do
       context 'repository in legacy storage already exists' do
         let(:repository_storage) { 'default' }
         let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage].legacy_disk_path }
+        let(:params) { { namespace: @to_user.namespace } }
 
         before do
           stub_application_setting(hashed_storage_enabled: false)
@@ -129,12 +130,21 @@ describe Projects::ForkService do
           gitlab_shell.remove_repository(repository_storage, "#{@to_user.namespace.full_path}/#{@from_project.path}")
         end
 
+        subject { fork_project(@from_project, @to_user, params) }
+
         it 'does not allow creation' do
-          to_project = fork_project(@from_project, @to_user, namespace: @to_user.namespace)
+          expect(subject).not_to be_persisted
+          expect(subject.errors.messages).to have_key(:base)
+          expect(subject.errors.messages[:base].first).to match('There is already a repository with that name on disk')
+        end
 
-          expect(to_project).not_to be_persisted
-          expect(to_project.errors.messages).to have_key(:base)
-          expect(to_project.errors.messages[:base].first).to match('There is already a repository with that name on disk')
+        context 'when repository disk validation is explicitly skipped' do
+          let(:params) { super().merge(skip_disk_validation: true) }
+
+          it 'allows fork project creation' do
+            expect(subject).to be_persisted
+            expect(subject.errors.messages).to be_empty
+          end
         end
       end