summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-05-23 14:22:22 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-05-23 14:22:22 +0200
commitbc9a0e10b50430e0b253a15d1628b6776d0bd9fe (patch)
tree6e6b56769eb125d7ed3d7f05b51441a1e0825997
parent92de5f778faa989fb25f9a5c93c5e23618f2d87b (diff)
downloadgitlab-ce-bc9a0e10b50430e0b253a15d1628b6776d0bd9fe.tar.gz
Reduce amount of expected pipeline serialization queries in specs
-rw-r--r--spec/controllers/projects/pipelines_controller_spec.rb2
-rw-r--r--spec/serializers/pipeline_serializer_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index d7253c90ee5..62eece8de4a 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -36,7 +36,7 @@ describe Projects::PipelinesController do
expect(json_response['count']['running']).to eq '1'
expect(json_response['count']['pending']).to eq '1'
expect(json_response['count']['finished']).to eq '2'
- expect(queries.count).to be_within(2).of(29)
+ expect(queries.count).to be < 30
end
it 'does not include coverage data for the pipelines' do
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb
index b741308e2c5..5108eb4deec 100644
--- a/spec/serializers/pipeline_serializer_spec.rb
+++ b/spec/serializers/pipeline_serializer_spec.rb
@@ -120,7 +120,7 @@ describe PipelineSerializer do
it 'verifies number of queries', :request_store do
recorded = ActiveRecord::QueryRecorder.new { subject }
- expect(recorded.count).to be_within(1).of(44)
+ expect(recorded.count).to be_within(1).of(38)
expect(recorded.cached_count).to eq(0)
end
end
@@ -139,7 +139,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-ce/issues/46368
- expect(recorded.count).to be_within(1).of(51)
+ expect(recorded.count).to be_within(1).of(45)
expect(recorded.cached_count).to eq(0)
end
end