Skip to content
Snippets Groups Projects
Unverified Commit a2708685 authored by Sashi Kumar's avatar Sashi Kumar Committed by GitLab
Browse files

Merge branch '461936-fix-flaky-spec' into 'master'

parents 973de31c dff3bde2
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -130,9 +130,10 @@
 
it 'preloads related merge requests' do
recorded = ActiveRecord::QueryRecorder.new { subject }
expected_query = "FROM \"merge_requests\" WHERE \"merge_requests\".\"id\" IN (#{merge_request_1.id}, #{merge_request_2.id})"
id_pattern = /#{merge_request_1.id}, #{merge_request_2.id}|#{merge_request_2.id}, #{merge_request_1.id}/
expected_query = /FROM "merge_requests" WHERE "merge_requests"\."id" IN \(#{id_pattern}\)/
 
expect(recorded.log).to include(a_string_including(expected_query))
expect(recorded.log).to include(a_string_matching(expected_query))
end
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment