Merge branch 'master' into sh-support-bitbucket-server-import

6 files changed, 13 insertions, 13 deletions

diff --git a/spec/services/groups/destroy_service_spec.rb b/spec/services/groups/destroy_service_spec.rb
index a9baccd061a..b54491cf5f9 100644
--- a/spec/services/groups/destroy_service_spec.rb
+++ b/spec/services/groups/destroy_service_spec.rb
@@ -49,7 +49,7 @@ describe Groups::DestroyService do
       context 'Sidekiq inline' do
         before do
           # Run sidekiq immediately to check that renamed dir will be removed
-          Sidekiq::Testing.inline! { destroy_group(group, user, async) }
+          perform_enqueued_jobs { destroy_group(group, user, async) }
         end
 
         it 'verifies that paths have been deleted' do
diff --git a/spec/services/projects/create_from_template_service_spec.rb b/spec/services/projects/create_from_template_service_spec.rb
index 9aa9237d875..a43da01f37e 100644
--- a/spec/services/projects/create_from_template_service_spec.rb
+++ b/spec/services/projects/create_from_template_service_spec.rb
@@ -28,7 +28,7 @@ describe Projects::CreateFromTemplateService do
 
   context 'the result project' do
     before do
-      Sidekiq::Testing.inline! do
+      perform_enqueued_jobs do
         @project = subject.execute
       end
 
diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb
index 38660ad7a01..e428808ab68 100644
--- a/spec/services/projects/destroy_service_spec.rb
+++ b/spec/services/projects/destroy_service_spec.rb
@@ -45,18 +45,18 @@ describe Projects::DestroyService do
   shared_examples 'handles errors thrown during async destroy' do |error_message|
     it 'does not allow the error to bubble up' do
       expect do
-        Sidekiq::Testing.inline! { destroy_project(project, user, {}) }
+        perform_enqueued_jobs { destroy_project(project, user, {}) }
       end.not_to raise_error
     end
 
     it 'unmarks the project as "pending deletion"' do
-      Sidekiq::Testing.inline! { destroy_project(project, user, {}) }
+      perform_enqueued_jobs { destroy_project(project, user, {}) }
 
       expect(project.reload.pending_delete).to be(false)
     end
 
     it 'stores an error message in `projects.delete_error`' do
-      Sidekiq::Testing.inline! { destroy_project(project, user, {}) }
+      perform_enqueued_jobs { destroy_project(project, user, {}) }
 
       expect(project.reload.delete_error).to be_present
       expect(project.delete_error).to include(error_message)
@@ -66,7 +66,7 @@ describe Projects::DestroyService do
   context 'Sidekiq inline' do
     before do
       # Run sidekiq immediatly to check that renamed repository will be removed
-      Sidekiq::Testing.inline! { destroy_project(project, user, {}) }
+      perform_enqueued_jobs { destroy_project(project, user, {}) }
     end
 
     context 'when has remote mirrors' do
@@ -110,7 +110,7 @@ describe Projects::DestroyService do
     end
 
     it 'keeps project team intact upon an error' do
-      Sidekiq::Testing.inline! do
+      perform_enqueued_jobs do
         begin
           destroy_project(project, user, {})
         rescue ::Redis::CannotConnectError
@@ -128,7 +128,7 @@ describe Projects::DestroyService do
       before do
         project.project_feature.update_attribute("issues_access_level", ProjectFeature::PRIVATE)
         # Run sidekiq immediately to check that renamed repository will be removed
-        Sidekiq::Testing.inline! { destroy_project(project, user, {}) }
+        perform_enqueued_jobs { destroy_project(project, user, {}) }
       end
 
       it_behaves_like 'deleting the project'
@@ -172,7 +172,7 @@ describe Projects::DestroyService do
 
         it 'allows error to bubble up and rolls back project deletion' do
           expect do
-            Sidekiq::Testing.inline! { destroy_project(project, user, {}) }
+            perform_enqueued_jobs { destroy_project(project, user, {}) }
           end.to raise_error(Exception, 'Other error message')
 
           expect(project.reload.pending_delete).to be(false)
diff --git a/spec/services/projects/housekeeping_service_spec.rb b/spec/services/projects/housekeeping_service_spec.rb
index 1cf373d1d72..18ecef1c0a1 100644
--- a/spec/services/projects/housekeeping_service_spec.rb
+++ b/spec/services/projects/housekeeping_service_spec.rb
@@ -35,7 +35,7 @@ describe Projects::HousekeepingService do
       allow(subject).to receive(:gc_period).and_return(1)
       project.increment_pushes_since_gc
 
-      Sidekiq::Testing.inline! do
+      perform_enqueued_jobs do
         expect { subject.execute }.to change { project.pushes_since_gc }.to(0)
       end
     end
diff --git a/spec/services/projects/import_service_spec.rb b/spec/services/projects/import_service_spec.rb
index b3815045792..e2a600d12d1 100644
--- a/spec/services/projects/import_service_spec.rb
+++ b/spec/services/projects/import_service_spec.rb
@@ -69,7 +69,7 @@ describe Projects::ImportService do
         result = subject.execute
 
         expect(result[:status]).to eq :error
-        expect(result[:message]).to eq "Error importing repository #{project.import_url} into #{project.full_path} - The repository could not be created."
+        expect(result[:message]).to eq "Error importing repository #{project.safe_import_url} into #{project.full_path} - The repository could not be created."
       end
 
       context 'when repository creation succeeds' do
@@ -141,7 +141,7 @@ describe Projects::ImportService do
           result = subject.execute
 
           expect(result[:status]).to eq :error
-          expect(result[:message]).to eq "Error importing repository #{project.import_url} into #{project.full_path} - Failed to import the repository"
+          expect(result[:message]).to eq "Error importing repository #{project.safe_import_url} into #{project.full_path} - Failed to import the repository"
         end
 
         context 'when repository import scheduled' do
diff --git a/spec/services/users/destroy_service_spec.rb b/spec/services/users/destroy_service_spec.rb
index f82d4b483e7..3bae8bfbd42 100644
--- a/spec/services/users/destroy_service_spec.rb
+++ b/spec/services/users/destroy_service_spec.rb
@@ -173,7 +173,7 @@ describe Users::DestroyService do
 
     describe "user personal's repository removal" do
       before do
-        Sidekiq::Testing.inline! { service.execute(user) }
+        perform_enqueued_jobs { service.execute(user) }
       end
 
       context 'legacy storage' do