Rename pages namespace or project path when changed

- Move UploadsTransfer to ProjectTransfer and inherit from this to UploadsTransfer and PagesTransfer

1 files changed, 6 insertions, 5 deletions

diff --git a/spec/lib/gitlab/uploads_transfer_spec.rb b/spec/lib/gitlab/project_transfer_spec.rb
index 4092f7fb638..e2d6b1b9ab7 100644
--- a/spec/lib/gitlab/uploads_transfer_spec.rb
+++ b/spec/lib/gitlab/project_transfer_spec.rb
@@ -1,9 +1,10 @@
 require 'spec_helper'
 
-describe Gitlab::UploadsTransfer, lib: true do
+describe Gitlab::ProjectTransfer, lib: true do
   before do
     @root_dir = File.join(Rails.root, "public", "uploads")
-    @upload_transfer = Gitlab::UploadsTransfer.new
+    @project_transfer = Gitlab::ProjectTransfer.new
+    allow(@project_transfer).to receive(:root_dir).and_return(@root_dir)
 
     @project_path_was = "test_project_was"
     @project_path = "test_project"
@@ -21,7 +22,7 @@ describe Gitlab::UploadsTransfer, lib: true 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))
-      @upload_transfer.move_project(@project_path, @namespace_path_was, @namespace_path)
+      @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
@@ -31,7 +32,7 @@ describe Gitlab::UploadsTransfer, lib: true do
   describe '#rename_project' do
     it "renames project" do
       FileUtils.mkdir_p(File.join(@root_dir, @namespace_path, @project_path_was))
-      @upload_transfer.rename_project(@project_path_was, @project_path, @namespace_path)
+      @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
@@ -41,7 +42,7 @@ describe Gitlab::UploadsTransfer, lib: true do
   describe '#rename_namespace' do
     it "renames namespace" do
       FileUtils.mkdir_p(File.join(@root_dir, @namespace_path_was, @project_path))
-      @upload_transfer.rename_namespace(@namespace_path_was, @namespace_path)
+      @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