Add latest changes from gitlab-org/gitlab@master

1 files changed, 23 insertions, 7 deletions

diff --git a/spec/graphql/resolvers/users/participants_resolver_spec.rb b/spec/graphql/resolvers/users/participants_resolver_spec.rb
index 77e3b6d5912..3f04d157410 100644
--- a/spec/graphql/resolvers/users/participants_resolver_spec.rb
+++ b/spec/graphql/resolvers/users/participants_resolver_spec.rb
@@ -13,6 +13,7 @@ RSpec.describe Resolvers::Users::ParticipantsResolver do
     let_it_be(:note) do
       create(
         :note,
+        :system,
         :confidential,
         project: project,
         noteable: issue,
@@ -20,6 +21,8 @@ RSpec.describe Resolvers::Users::ParticipantsResolver do
       )
     end
 
+    let_it_be(:note_metadata) { create(:system_note_metadata, note: note) }
+
     subject(:resolved_items) { resolve(described_class, args: {}, ctx: { current_user: current_user }, obj: issue)&.items }
 
     before do
@@ -50,17 +53,30 @@ RSpec.describe Resolvers::Users::ParticipantsResolver do
         is_expected.to match_array([issue.author, note.author])
       end
 
-      it 'does not execute N+1 for project relation' do
-        query = -> { resolve(described_class, args: {}, ctx: { current_user: current_user }, obj: issue)&.items }
+      context 'N+1 queries' do
+        let(:query) { -> { resolve(described_class, args: {}, ctx: { current_user: current_user }, obj: issue)&.items } }
+
+        before do
+          # warm-up
+          query.call
+        end
+
+        it 'does not execute N+1 for project relation' do
+          control_count = ActiveRecord::QueryRecorder.new { query.call }
+
+          create(:note, :confidential, project: project, noteable: issue, author: create(:user))
 
-        # warm-up
-        query.call
+          expect { query.call }.not_to exceed_query_limit(control_count)
+        end
 
-        control_count = ActiveRecord::QueryRecorder.new { query.call }
+        it 'does not execute N+1 for system note metadata relation' do
+          control_count = ActiveRecord::QueryRecorder.new { query.call }
 
-        create(:note, :confidential, project: project, noteable: issue, author: create(:user))
+          new_note = create(:note, :system, project: project, noteable: issue, author: create(:user))
+          create(:system_note_metadata, note: new_note)
 
-        expect { query.call }.not_to exceed_query_limit(control_count)
+          expect { query.call }.not_to exceed_query_limit(control_count)
+        end
       end
     end
   end