1 files changed, 17 insertions, 6 deletions
diff --git a/spec/lib/gitlab/graphql/loaders/batch_model_loader_spec.rb b/spec/lib/gitlab/graphql/loaders/batch_model_loader_spec.rb
index cf1f00bc176..7ae33346388 100644
--- a/spec/lib/gitlab/graphql/loaders/batch_model_loader_spec.rb
+++ b/spec/lib/gitlab/graphql/loaders/batch_model_loader_spec.rb
@@ -4,8 +4,9 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::Graphql::Loaders::BatchModelLoader do
   describe '#find' do
-    let(:issue) { create(:issue) }
-    let(:user) { create(:user) }
+    let_it_be(:issue) { create(:issue) }
+    let_it_be(:other_user) { create(:user) }
+    let_it_be(:user) { create(:user) }
 
     it 'finds a model by id' do
       issue_result = described_class.new(Issue, issue.id).find
@@ -16,15 +17,25 @@ RSpec.describe Gitlab::Graphql::Loaders::BatchModelLoader do
     end
 
     it 'only queries once per model' do
-      other_user = create(:user)
-      user
-      issue
-
       expect do
         [described_class.new(User, other_user.id).find,
          described_class.new(User, user.id).find,
          described_class.new(Issue, issue.id).find].map(&:sync)
       end.not_to exceed_query_limit(2)
     end
+
+    it 'does not force values unnecessarily' do
+      expect do
+        a = described_class.new(User, user.id).find
+        b = described_class.new(Issue, issue.id).find
+
+        b.sync
+
+        c = described_class.new(User, other_user.id).find
+
+        a.sync
+        c.sync
+      end.not_to exceed_query_limit(2)
+    end
   end
 end