From 317868d0bd0802d48f29422ce00b8dcddea8ea31 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Wed, 7 May 2014 04:12:02 +0900 Subject: Modify assert conditions not to be affected by each database bind variable naming conventions --- activerecord/test/cases/relation/merging_test.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'activerecord/test/cases/relation') diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb index ff1c2a0d82..48f45d45b1 100644 --- a/activerecord/test/cases/relation/merging_test.rb +++ b/activerecord/test/cases/relation/merging_test.rb @@ -17,8 +17,9 @@ class RelationMergingTest < ActiveRecord::TestCase end def test_relation_to_sql - sql = Post.first.comments.to_sql - assert_no_match(/\?/, sql) + post = Post.first + sql = post.comments.to_sql + assert_match(/.?post_id.? = #{post.id}\Z/i, sql) end def test_relation_merging_with_arel_equalities_keeps_last_equality -- cgit v1.2.3