Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'

Fix moving local, unhashed upload or pages directories during group transfer

Closes #43993

See merge request gitlab-org/gitlab-ce!17658

1 files changed, 53 insertions, 6 deletions

diff --git a/spec/lib/gitlab/project_transfer_spec.rb b/spec/lib/gitlab/project_transfer_spec.rb
index 10c5fb148cd..0b9b1f537b5 100644
--- a/spec/lib/gitlab/project_transfer_spec.rb
+++ b/spec/lib/gitlab/project_transfer_spec.rb
@@ -21,30 +21,77 @@ describe Gitlab::ProjectTransfer do
 
   describe '#move_project' do
     it "moves project upload to another namespace" do
-      FileUtils.mkdir_p(File.join(@root_dir, @namespace_path_was, @project_path))
+      path_to_be_moved = File.join(@root_dir, @namespace_path_was, @project_path)
+      expected_path = File.join(@root_dir, @namespace_path, @project_path)
+      FileUtils.mkdir_p(path_to_be_moved)
+
       @project_transfer.move_project(@project_path, @namespace_path_was, @namespace_path)
 
-      expected_path = File.join(@root_dir, @namespace_path, @project_path)
       expect(Dir.exist?(expected_path)).to be_truthy
     end
   end
 
+  describe '#move_namespace' do
+    context 'when moving namespace from root into another namespace' do
+      it "moves namespace projects' upload" do
+        child_namespace = 'test_child_namespace'
+        path_to_be_moved = File.join(@root_dir, child_namespace, @project_path)
+        expected_path = File.join(@root_dir, @namespace_path, child_namespace, @project_path)
+        FileUtils.mkdir_p(path_to_be_moved)
+
+        @project_transfer.move_namespace(child_namespace, nil, @namespace_path)
+
+        expect(Dir.exist?(expected_path)).to be_truthy
+      end
+    end
+
+    context 'when moving namespace from one parent to another' do
+      it "moves namespace projects' upload" do
+        child_namespace = 'test_child_namespace'
+        path_to_be_moved = File.join(@root_dir, @namespace_path_was, child_namespace, @project_path)
+        expected_path = File.join(@root_dir, @namespace_path, child_namespace, @project_path)
+        FileUtils.mkdir_p(path_to_be_moved)
+
+        @project_transfer.move_namespace(child_namespace, @namespace_path_was, @namespace_path)
+
+        expect(Dir.exist?(expected_path)).to be_truthy
+      end
+    end
+
+    context 'when moving namespace from having a parent to root' do
+      it "moves namespace projects' upload" do
+        child_namespace = 'test_child_namespace'
+        path_to_be_moved = File.join(@root_dir, @namespace_path_was, child_namespace, @project_path)
+        expected_path = File.join(@root_dir, child_namespace, @project_path)
+        FileUtils.mkdir_p(path_to_be_moved)
+
+        @project_transfer.move_namespace(child_namespace, @namespace_path_was, nil)
+
+        expect(Dir.exist?(expected_path)).to be_truthy
+      end
+    end
+  end
+
   describe '#rename_project' do
     it "renames project" do
-      FileUtils.mkdir_p(File.join(@root_dir, @namespace_path, @project_path_was))
+      path_to_be_moved = File.join(@root_dir, @namespace_path, @project_path_was)
+      expected_path = File.join(@root_dir, @namespace_path, @project_path)
+      FileUtils.mkdir_p(path_to_be_moved)
+
       @project_transfer.rename_project(@project_path_was, @project_path, @namespace_path)
 
-      expected_path = File.join(@root_dir, @namespace_path, @project_path)
       expect(Dir.exist?(expected_path)).to be_truthy
     end
   end
 
   describe '#rename_namespace' do
     it "renames namespace" do
-      FileUtils.mkdir_p(File.join(@root_dir, @namespace_path_was, @project_path))
+      path_to_be_moved = File.join(@root_dir, @namespace_path_was, @project_path)
+      expected_path = File.join(@root_dir, @namespace_path, @project_path)
+      FileUtils.mkdir_p(path_to_be_moved)
+
       @project_transfer.rename_namespace(@namespace_path_was, @namespace_path)
 
-      expected_path = File.join(@root_dir, @namespace_path, @project_path)
       expect(Dir.exist?(expected_path)).to be_truthy
     end
   end