Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 30 insertions, 12 deletions

diff --git a/spec/models/preloaders/user_max_access_level_in_projects_preloader_spec.rb b/spec/models/preloaders/user_max_access_level_in_projects_preloader_spec.rb
index 16e699b7e0e..eefe5bfc6c4 100644
--- a/spec/models/preloaders/user_max_access_level_in_projects_preloader_spec.rb
+++ b/spec/models/preloaders/user_max_access_level_in_projects_preloader_spec.rb
@@ -9,29 +9,47 @@ RSpec.describe Preloaders::UserMaxAccessLevelInProjectsPreloader do
   let_it_be(:project_3) { create(:project) }
 
   let(:projects) { [project_1, project_2, project_3] }
+  let(:query) { projects.each { |project| user.can?(:read_project, project) } }
 
   before do
     project_1.add_developer(user)
     project_2.add_developer(user)
   end
 
-  context 'preload maximum access level to avoid querying project_authorizations', :request_store do
-    it 'avoids N+1 queries', :request_store do
-      Preloaders::UserMaxAccessLevelInProjectsPreloader.new(projects, user).execute
+  context 'without preloader' do
+    it 'runs N queries' do
+      expect { query }.to make_queries(projects.size)
+    end
+  end
+
+  describe '#execute', :request_store do
+    let(:projects_arg) { projects }
+
+    before do
+      Preloaders::UserMaxAccessLevelInProjectsPreloader.new(projects_arg, user).execute
+    end
+
+    it 'avoids N+1 queries' do
+      expect { query }.not_to make_queries
+    end
 
-      query_count = ActiveRecord::QueryRecorder.new do
-        projects.each { |project| user.can?(:read_project, project) }
-      end.count
+    context 'when projects is an array of IDs' do
+      let(:projects_arg) { [project_1.id, project_2.id, project_3.id] }
 
-      expect(query_count).to eq(0)
+      it 'avoids N+1 queries' do
+        expect { query }.not_to make_queries
+      end
     end
 
-    it 'runs N queries without preloading' do
-      query_count = ActiveRecord::QueryRecorder.new do
-        projects.each { |project| user.can?(:read_project, project) }
-      end.count
+    # Test for handling of SQL table name clashes.
+    context 'when projects is a relation including project_authorizations' do
+      let(:projects_arg) do
+        Project.where(id: ProjectAuthorization.where(project_id: projects).select(:project_id))
+      end
 
-      expect(query_count).to eq(projects.size)
+      it 'avoids N+1 queries' do
+        expect { query }.not_to make_queries
+      end
     end
   end
 end