From b777892202b79660ecf6316b657349e37a8adafe Mon Sep 17 00:00:00 2001 From: Brett Walker Date: Fri, 8 Dec 2017 17:18:48 +0100 Subject: use `exceed_query_limit` to make spec common across ce/ee --- spec/services/users/keys_count_service_spec.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/spec/services/users/keys_count_service_spec.rb b/spec/services/users/keys_count_service_spec.rb index ccfd922b8fa..59152669e20 100644 --- a/spec/services/users/keys_count_service_spec.rb +++ b/spec/services/users/keys_count_service_spec.rb @@ -11,20 +11,16 @@ describe Users::KeysCountService, :use_clean_rails_memory_store_caching do create(:personal_key, user: user) end - let(:num_queries) { 1 } - it 'returns the number of SSH keys as an Integer' do expect(service.count).to eq(1) end it 'caches the number of keys in Redis' do service.delete_cache + control_count = ActiveRecord::QueryRecorder.new { service.count }.count + service.delete_cache - recorder = ActiveRecord::QueryRecorder.new do - 2.times { service.count } - end - - expect(recorder.count).to eq(num_queries) + expect { 2.times { service.count } }.not_to exceed_query_limit(control_count + 1) end end -- cgit v1.2.1