Merge branch 'release/12.1' into dev

app/workers/principals/delete_job.rb

@@ -61,7 +61,7 @@ class Principals::DeleteJob < ApplicationJob
   end
 
   def delete_private_queries(principal)
-    ::Query.where(user_id: principal.id, public: false).delete_all
+    ::Query.where(user_id: principal.id, public: false).destroy_all
     CostQuery.where(user_id: principal.id, is_public: false).delete_all
   end
 

spec/features/users/delete_spec.rb

@@ -91,7 +91,7 @@ describe 'user deletion:', type: :feature, js: true do
              password_confirmation: user_password)
     end
 
-    it 'can delete other users if the setting permitts it', selenium: true do
+    it 'can delete other users if the setting permits it', selenium: true do
       Setting.users_deletable_by_admins = 1
       visit edit_user_path(user)
 

spec/workers/principals/delete_job_integration_spec.rb

@@ -210,7 +210,7 @@ describe Principals::DeleteJob, type: :model do
 
     shared_examples_for 'private query handling' do
       let!(:query) do
-        create(:private_query, user: principal)
+        create(:private_query, user: principal, views: [create(:view_work_packages_table)])
       end
 
       before do