3 files changed, 20 insertions, 12 deletions

diff --git a/spec/services/issues/export_csv_service_spec.rb b/spec/services/issues/export_csv_service_spec.rb
index 83dfca923fb..016174f9888 100644
--- a/spec/services/issues/export_csv_service_spec.rb
+++ b/spec/services/issues/export_csv_service_spec.rb
@@ -175,11 +175,11 @@ RSpec.describe Issues::ExportCsvService, :with_license, feature_category: :team_
         let(:labeled_issues) { create_list(:labeled_issue, 2, project: project, author: user, labels: [feature_label, idea_label]) }
 
         it 'does not run a query for each label link' do
-          control_count = ActiveRecord::QueryRecorder.new { csv }.count
+          control = ActiveRecord::QueryRecorder.new { csv }
 
           labeled_issues
 
-          expect { csv }.not_to exceed_query_limit(control_count)
+          expect { csv }.not_to exceed_query_limit(control)
           expect(csv.count).to eq(4)
         end
 
diff --git a/spec/services/issues/referenced_merge_requests_service_spec.rb b/spec/services/issues/referenced_merge_requests_service_spec.rb
index 4781daf7688..6748292d389 100644
--- a/spec/services/issues/referenced_merge_requests_service_spec.rb
+++ b/spec/services/issues/referenced_merge_requests_service_spec.rb
@@ -39,13 +39,13 @@ RSpec.describe Issues::ReferencedMergeRequestsService, feature_category: :team_p
     context 'performance' do
       it 'does not run extra queries when extra namespaces are included', :use_clean_rails_memory_store_caching do
         service.execute(issue) # warm cache
-        control_count = ActiveRecord::QueryRecorder.new { service.execute(issue) }.count
+        control = ActiveRecord::QueryRecorder.new { service.execute(issue) }
 
         third_project = create(:project, :public)
         create_closing_mr(source_project: third_project)
         service.execute(issue) # warm cache
 
-        expect { service.execute(issue) }.not_to exceed_query_limit(control_count)
+        expect { service.execute(issue) }.not_to exceed_query_limit(control)
       end
 
       it 'preloads the head pipeline for each merge request, and its routes' do
@@ -58,12 +58,12 @@ RSpec.describe Issues::ReferencedMergeRequestsService, feature_category: :team_p
         end
 
         closing_mr_other_project.update!(head_pipeline: create(:ci_pipeline))
-        control_count = ActiveRecord::QueryRecorder.new { service.execute(reloaded_issue).each(&pipeline_routes) }
+        control = ActiveRecord::QueryRecorder.new { service.execute(reloaded_issue).each(&pipeline_routes) }
 
         closing_mr.update!(head_pipeline: create(:ci_pipeline))
 
         expect { service.execute(issue).each(&pipeline_routes) }
-          .not_to exceed_query_limit(control_count)
+          .not_to exceed_query_limit(control)
       end
 
       it 'only loads issue notes once' do
@@ -95,12 +95,12 @@ RSpec.describe Issues::ReferencedMergeRequestsService, feature_category: :team_p
     context 'performance' do
       it 'does not run a query for each note author', :use_clean_rails_memory_store_caching do
         service.referenced_merge_requests(issue) # warm cache
-        control_count = ActiveRecord::QueryRecorder.new { service.referenced_merge_requests(issue) }.count
+        control = ActiveRecord::QueryRecorder.new { service.referenced_merge_requests(issue) }
 
         create(:note, project: project, noteable: issue, author: create(:user))
         service.referenced_merge_requests(issue) # warm cache
 
-        expect { service.referenced_merge_requests(issue) }.not_to exceed_query_limit(control_count)
+        expect { service.referenced_merge_requests(issue) }.not_to exceed_query_limit(control)
       end
     end
   end
@@ -121,12 +121,12 @@ RSpec.describe Issues::ReferencedMergeRequestsService, feature_category: :team_p
     context 'performance' do
       it 'does not run a query for each note author', :use_clean_rails_memory_store_caching do
         service.closed_by_merge_requests(issue) # warm cache
-        control_count = ActiveRecord::QueryRecorder.new { service.closed_by_merge_requests(issue) }.count
+        control = ActiveRecord::QueryRecorder.new { service.closed_by_merge_requests(issue) }
 
         create(:note, :system, project: project, noteable: issue, author: create(:user))
         service.closed_by_merge_requests(issue) # warm cache
 
-        expect { service.closed_by_merge_requests(issue) }.not_to exceed_query_limit(control_count)
+        expect { service.closed_by_merge_requests(issue) }.not_to exceed_query_limit(control)
       end
     end
   end
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 0cb13bfb917..e8bcdc2c44b 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -592,11 +592,19 @@ RSpec.describe Issues::UpdateService, :mailer, feature_category: :team_planning
         update_issue(confidential: true)
       end
 
+      it 'allows assignment of guest users' do
+        update_issue(confidential: true)
+
+        update_issue(assignee_ids: [guest.id])
+
+        expect(issue.reload.assignees).to contain_exactly(guest)
+      end
+
       it 'does not update assignee_id with unauthorized users' do
-        project.update!(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
         update_issue(confidential: true)
+
         non_member = create(:user)
-        original_assignees = issue.assignees
+        original_assignees = issue.assignees.to_a
 
         update_issue(assignee_ids: [non_member.id])