diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-04-10 12:24:36 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-04-10 12:24:36 +0000 |
commit | 417c93a954f8434fd477c7cff3a8fdece93996c7 (patch) | |
tree | c7ca441def4c6ce1622b576904d57a1292916be3 /spec | |
parent | 94d9de694ec75f118077010e696f13150cd30cc7 (diff) | |
parent | 60f0e3c9933c9080e173be04471fe11eb3cab74f (diff) | |
download | gitlab-ce-417c93a954f8434fd477c7cff3a8fdece93996c7.tar.gz |
Merge branch '6623-extract-ee-specific-files-lines-for-ci-spec-serializers' into 'master'
Resolve "Extract EE specific files/lines for CI spec/serializers"
See merge request gitlab-org/gitlab-ce!27214
Diffstat (limited to 'spec')
-rw-r--r-- | spec/serializers/pipeline_serializer_spec.rb | 6 |
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 |