summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2019-04-10 13:18:31 +0200
committerMatija Čupić <matteeyah@gmail.com>2019-04-10 13:18:31 +0200
commit60f0e3c9933c9080e173be04471fe11eb3cab74f (patch)
tree8dd3a836d5a2a33d914acc0494e7988ee6bc5106
parent2238b12df9f416dbe752512a2cc256905648e6ed (diff)
downloadgitlab-ce-6623-extract-ee-specific-files-lines-for-ci-spec-serializers.tar.gz
Use different query count expectations in EE6623-extract-ee-specific-files-lines-for-ci-spec-serializers
-rw-r--r--spec/serializers/pipeline_serializer_spec.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb
index 0fdd675aa01..d9023036534 100644
--- a/spec/serializers/pipeline_serializer_spec.rb
+++ b/spec/serializers/pipeline_serializer_spec.rb
@@ -157,7 +157,8 @@ describe PipelineSerializer do
it 'verifies number of queries', :request_store do
recorded = ActiveRecord::QueryRecorder.new { subject }
- expect(recorded.count).to be_within(2).of(31)
+ expected_queries = Gitlab.ee? ? 38 : 31
+ expect(recorded.count).to be_within(2).of(expected_queries)
expect(recorded.cached_count).to eq(0)
end
end
@@ -176,7 +177,8 @@ describe PipelineSerializer do
# pipeline. With the same ref this check is cached but if refs are
# different then there is an extra query per ref
# https://gitlab.com/gitlab-org/gitlab-ce/issues/46368
- expect(recorded.count).to be_within(2).of(38)
+ expected_queries = Gitlab.ee? ? 44 : 38
+ expect(recorded.count).to be_within(2).of(expected_queries)
expect(recorded.cached_count).to eq(0)
end
end