summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Walker <bwalker@gitlab.com>2017-12-08 17:18:48 +0100
committerBrett Walker <bwalker@gitlab.com>2017-12-08 17:18:48 +0100
commitb777892202b79660ecf6316b657349e37a8adafe (patch)
tree7ba02f452c887e4d3783d1668e640ca9d368bb40
parente98f490daef934e4669ac090f24285f35c6379a9 (diff)
downloadgitlab-ce-bw-fix-key-count-service-spec.tar.gz
use `exceed_query_limit` to make spec common across ce/eebw-fix-key-count-service-spec
-rw-r--r--spec/services/users/keys_count_service_spec.rb10
1 files 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