1 files changed, 41 insertions, 17 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 7411bc95147..1cfeeac49cd 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
@@ -28,34 +28,58 @@ RSpec.describe Preloaders::UserMaxAccessLevelInProjectsPreloader do
     end
   end
 
-  describe '#execute', :request_store do
+  shared_examples '#execute' 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
-
-    context 'when projects is an array of IDs' do
-      let(:projects_arg) { projects.map(&:id) }
+    context 'when user is present' do
+      before do
+        Preloaders::UserMaxAccessLevelInProjectsPreloader.new(projects_arg, user).execute
+      end
 
       it 'avoids N+1 queries' do
         expect { query }.not_to make_queries
       end
+
+      context 'when projects is an array of IDs' do
+        let(:projects_arg) { projects.map(&:id) }
+
+        it 'avoids N+1 queries' do
+          expect { query }.not_to make_queries
+        end
+      end
+
+      # 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
+
+        it 'avoids N+1 queries' do
+          expect { query }.not_to make_queries
+        end
+      end
     end
 
-    # 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))
+    context 'when user is not present' do
+      before do
+        Preloaders::UserMaxAccessLevelInProjectsPreloader.new(projects_arg, nil).execute
       end
 
-      it 'avoids N+1 queries' do
-        expect { query }.not_to make_queries
+      it 'does not avoid N+1 queries' do
+        expect { query }.to make_queries
+      end
+    end
+  end
+
+  describe '#execute', :request_store do
+    include_examples '#execute'
+
+    context 'when projects_preloader_fix is disabled' do
+      before do
+        stub_feature_flags(projects_preloader_fix: false)
       end
+
+      include_examples '#execute'
     end
   end
 end