diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-24 18:07:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-24 18:07:44 +0300 |
| commit | ac9d41902b722212197aa134f1b309004ebe6c42 (patch) | |
| tree | 52b1ebeb4f8832b7b2af9026b592c338af539bd6 /spec/serializers | |
| parent | c6373a2cec855c6543a1e035c52099e102dd05ef (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers')
| -rw-r--r-- | spec/serializers/pipeline_serializer_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb index f1f761a6fd0..8158277ffbc 100644 --- a/spec/serializers/pipeline_serializer_spec.rb +++ b/spec/serializers/pipeline_serializer_spec.rb @@ -159,7 +159,7 @@ describe PipelineSerializer do it 'verifies number of queries', :request_store do recorded = ActiveRecord::QueryRecorder.new { subject } - expected_queries = Gitlab.ee? ? 38 : 35 + expected_queries = Gitlab.ee? ? 42 : 39 expect(recorded.count).to be_within(2).of(expected_queries) expect(recorded.cached_count).to eq(0) @@ -180,7 +180,7 @@ 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-foss/issues/46368 - expected_queries = Gitlab.ee? ? 41 : 38 + expected_queries = Gitlab.ee? ? 45 : 42 expect(recorded.count).to be_within(2).of(expected_queries) expect(recorded.cached_count).to eq(0) |