1 files changed, 37 insertions, 9 deletions
diff --git a/spec/services/projects/after_rename_service_spec.rb b/spec/services/projects/after_rename_service_spec.rb
index 52136b37c66..f03e1ed0e22 100644
--- a/spec/services/projects/after_rename_service_spec.rb
+++ b/spec/services/projects/after_rename_service_spec.rb
@@ -22,7 +22,6 @@ RSpec.describe Projects::AfterRenameService do
         # call. This makes testing a bit easier.
         allow(project).to receive(:gitlab_shell).and_return(gitlab_shell)
 
-        stub_feature_flags(skip_hashed_storage_upgrade: false)
         stub_application_setting(hashed_storage_enabled: false)
       end
 
@@ -62,13 +61,28 @@ RSpec.describe Projects::AfterRenameService do
 
       context 'gitlab pages' do
         before do
-          expect(project_storage).to receive(:rename_repo) { true }
+          allow(project_storage).to receive(:rename_repo) { true }
         end
 
-        it 'moves pages folder to new location' do
-          expect_any_instance_of(Gitlab::PagesTransfer).to receive(:rename_project)
+        context 'when the project has pages deployed' do
+          it 'schedules a move of the pages directory' do
+            allow(project).to receive(:pages_deployed?).and_return(true)
 
-          service_execute
+            expect(PagesTransferWorker).to receive(:perform_async).with('rename_project', anything)
+
+            service_execute
+          end
+        end
+
+        context 'when the project does not have pages deployed' do
+          it 'does nothing with the pages directory' do
+            allow(project).to receive(:pages_deployed?).and_return(false)
+
+            expect(PagesTransferWorker).not_to receive(:perform_async)
+            expect(Gitlab::PagesTransfer).not_to receive(:new)
+
+            service_execute
+          end
         end
       end
 
@@ -126,7 +140,6 @@ RSpec.describe Projects::AfterRenameService do
         # call. This makes testing a bit easier.
         allow(project).to receive(:gitlab_shell).and_return(gitlab_shell)
 
-        stub_feature_flags(skip_hashed_storage_upgrade: false)
         stub_application_setting(hashed_storage_enabled: true)
       end
 
@@ -160,10 +173,25 @@ RSpec.describe Projects::AfterRenameService do
       end
 
       context 'gitlab pages' do
-        it 'moves pages folder to new location' do
-          expect_any_instance_of(Gitlab::PagesTransfer).to receive(:rename_project)
+        context 'when the project has pages deployed' do
+          it 'schedules a move of the pages directory' do
+            allow(project).to receive(:pages_deployed?).and_return(true)
 
-          service_execute
+            expect(PagesTransferWorker).to receive(:perform_async).with('rename_project', anything)
+
+            service_execute
+          end
+        end
+
+        context 'when the project does not have pages deployed' do
+          it 'does nothing with the pages directory' do
+            allow(project).to receive(:pages_deployed?).and_return(false)
+
+            expect(PagesTransferWorker).not_to receive(:perform_async)
+            expect(Gitlab::PagesTransfer).not_to receive(:new)
+
+            service_execute
+          end
         end
       end