aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-04-05 23:48:16 -0700
committerJosé Valim <jose.valim@gmail.com>2010-04-10 13:50:35 +0200
commit922e4c57a4a8efe5b045cf800692c487cbacb93c (patch)
tree4bf3be7361fc24075db1f64d7889ce2b74b7a7d1 /activerecord/test/cases
parentb22d0914acf04f4440db7ed281fb821150524614 (diff)
downloadrails-922e4c57a4a8efe5b045cf800692c487cbacb93c.tar.gz
rails-922e4c57a4a8efe5b045cf800692c487cbacb93c.tar.bz2
rails-922e4c57a4a8efe5b045cf800692c487cbacb93c.zip
kill warnings on 1.8.7 [#4331 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/associations/belongs_to_associations_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 62121b93cb..be77ee4bf3 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -35,11 +35,11 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
def test_belongs_to_with_primary_key_joins_on_correct_column
sql = Client.joins(:firm_with_primary_key).to_sql
if current_adapter?(:MysqlAdapter)
- assert_no_match /`firm_with_primary_keys_companies`\.`id`/, sql
- assert_match /`firm_with_primary_keys_companies`\.`name`/, sql
+ assert_no_match(/`firm_with_primary_keys_companies`\.`id`/, sql)
+ assert_match(/`firm_with_primary_keys_companies`\.`name`/, sql)
else
- assert_no_match /"firm_with_primary_keys_companies"\."id"/, sql
- assert_match /"firm_with_primary_keys_companies"\."name"/, sql
+ assert_no_match(/"firm_with_primary_keys_companies"\."id"/, sql)
+ assert_match(/"firm_with_primary_keys_companies"\."name"/, sql)
end
end