diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-22 20:53:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-22 20:53:23 +0000 |
| commit | 3cfcbcf35badfdb21244f7f16c8640cd83b49205 (patch) | |
| tree | b232689ffa9a75302658de54b771b42f5c039b1d /spec/controllers | |
| parent | 44f07f63d0d7e955e9b1d8100b357d36d131c2b9 (diff) | |
| parent | 28ffb4bf2fd7544722b596ad3339a149ae9a46d2 (diff) | |
| download | gitlab-ce-3cfcbcf35badfdb21244f7f16c8640cd83b49205.tar.gz | |
Merge branch 'handle-transient-mr-query-count-spec' into 'master'
Handle transient MR query count spec
See merge request !11571
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index f0dc6df15ee..457e07334b9 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -127,7 +127,7 @@ describe Projects::MergeRequestsController do recorded = ActiveRecord::QueryRecorder.new { go(format: :json) } - expect(recorded.count).to be_within(1).of(51) + expect(recorded.count).to be_within(5).of(50) expect(recorded.cached_count).to eq(0) end end |