Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

1 files changed, 7 insertions, 3 deletions

diff --git a/spec/lib/gitlab/query_limiting/transaction_spec.rb b/spec/lib/gitlab/query_limiting/transaction_spec.rb
index 40804736b86..76bb2b4c4cc 100644
--- a/spec/lib/gitlab/query_limiting/transaction_spec.rb
+++ b/spec/lib/gitlab/query_limiting/transaction_spec.rb
@@ -68,11 +68,15 @@ RSpec.describe Gitlab::QueryLimiting::Transaction do
     it 'increments the number of executed queries' do
       transaction = described_class.new
 
-      expect(transaction.count).to be_zero
+      expect { transaction.increment }.to change { transaction.count }.by(1)
+    end
+
+    it 'does not increment the number of executed queries when query limiting is disabled' do
+      transaction = described_class.new
 
-      transaction.increment
+      allow(transaction).to receive(:enabled?).and_return(false)
 
-      expect(transaction.count).to eq(1)
+      expect { transaction.increment }.not_to change { transaction.count }
     end
   end