Merge branch 'improve-extra-queries-output' into 'master'
Improve output for extra queries in specs See merge request gitlab-org/gitlab-ce!15537
This commit is contained in:
commit
c4de6ec496
2 changed files with 12 additions and 5 deletions
|
@ -172,15 +172,15 @@ describe API::MergeRequests do
|
||||||
|
|
||||||
context "when authenticated" do
|
context "when authenticated" do
|
||||||
it 'avoids N+1 queries' do
|
it 'avoids N+1 queries' do
|
||||||
control_count = ActiveRecord::QueryRecorder.new do
|
control = ActiveRecord::QueryRecorder.new do
|
||||||
get api("/projects/#{project.id}/merge_requests", user)
|
get api("/projects/#{project.id}/merge_requests", user)
|
||||||
end.count
|
end
|
||||||
|
|
||||||
create(:merge_request, state: 'closed', milestone: milestone1, author: user, assignee: user, source_project: project, target_project: project, title: "Test", created_at: base_time)
|
create(:merge_request, state: 'closed', milestone: milestone1, author: user, assignee: user, source_project: project, target_project: project, title: "Test", created_at: base_time)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
get api("/projects/#{project.id}/merge_requests", user)
|
get api("/projects/#{project.id}/merge_requests", user)
|
||||||
end.not_to exceed_query_limit(control_count)
|
end.not_to exceed_query_limit(control)
|
||||||
end
|
end
|
||||||
|
|
||||||
it "returns an array of all merge_requests" do
|
it "returns an array of all merge_requests" do
|
||||||
|
|
|
@ -76,10 +76,17 @@ RSpec::Matchers.define :exceed_query_limit do |expected|
|
||||||
@recorder.count
|
@recorder.count
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def count_queries(queries)
|
||||||
|
queries.each_with_object(Hash.new(0)) { |query, counts| counts[query] += 1 }
|
||||||
|
end
|
||||||
|
|
||||||
def log_message
|
def log_message
|
||||||
if expected.is_a?(ActiveRecord::QueryRecorder)
|
if expected.is_a?(ActiveRecord::QueryRecorder)
|
||||||
extra_queries = (expected.log - @recorder.log).join("\n\n")
|
counts = count_queries(expected.log)
|
||||||
"Extra queries: \n\n #{extra_queries}"
|
extra_queries = @recorder.log.reject { |query| counts[query] -= 1 unless counts[query].zero? }
|
||||||
|
extra_queries_display = count_queries(extra_queries).map { |query, count| "[#{count}] #{query}" }
|
||||||
|
|
||||||
|
(['Extra queries:'] + extra_queries_display).join("\n\n")
|
||||||
else
|
else
|
||||||
@recorder.log_message
|
@recorder.log_message
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue