mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #11668 from neerajdotname/make_test_order_independent_2
Make test order independent
This commit is contained in:
commit
0cdac3e029
2 changed files with 6 additions and 3 deletions
|
@ -186,7 +186,9 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase
|
|||
members = assert_queries(4) { Member.includes(:organization_member_details_2).to_a.sort_by(&:id) }
|
||||
groucho_details, other_details = member_details(:groucho), member_details(:some_other_guy)
|
||||
|
||||
assert_no_queries do
|
||||
# postgresql test if randomly executed then executes "SHOW max_identifier_length". Hence
|
||||
# the need to ignore certain predefined sqls that deal with system calls.
|
||||
assert_no_queries(ignore_none: false) do
|
||||
assert_equal [groucho_details, other_details], members.first.organization_member_details_2.sort_by(&:id)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -45,8 +45,9 @@ module ActiveRecord
|
|||
x
|
||||
end
|
||||
|
||||
def assert_no_queries(&block)
|
||||
assert_queries(0, :ignore_none => true, &block)
|
||||
def assert_no_queries(options = {}, &block)
|
||||
options.reverse_merge! ignore_none: true
|
||||
assert_queries(0, options, &block)
|
||||
end
|
||||
|
||||
def assert_column(model, column_name, msg=nil)
|
||||
|
|
Loading…
Reference in a new issue