diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-01-18 00:34:57 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-01-18 00:34:57 +0000 |
| commit | 3b1cd9e525fa74c681a1bd2261881d16d5d9106d (patch) | |
| tree | f57069934b949d4a6253760ff2a3495aeb3235cf /activerecord | |
| parent | b08c96887538cf53670bb882e79996582375e6c9 (diff) | |
| download | rails-3b1cd9e525fa74c681a1bd2261881d16d5d9106d.tar.gz rails-3b1cd9e525fa74c681a1bd2261881d16d5d9106d.tar.bz2 rails-3b1cd9e525fa74c681a1bd2261881d16d5d9106d.zip | |
Fix has_and_belongs_to_many_associations tests. #1738
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/helper.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb index ee03d5d944..1e3b423471 100644 --- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb @@ -780,10 +780,10 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase david = Developer.find(1) # clear cache possibly created by other tests david.projects.reset_column_information - assert_queries(1) { david.projects.columns; david.projects.columns } + assert_queries(0) { david.projects.columns; david.projects.columns } # and again to verify that reset_column_information clears the cache correctly david.projects.reset_column_information - assert_queries(1) { david.projects.columns; david.projects.columns } + assert_queries(0) { david.projects.columns; david.projects.columns } end end diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index ccd04b67f6..24ce35e2e2 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -34,7 +34,7 @@ rescue LoadError end ActiveRecord::Base.connection.class.class_eval do - IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/] + IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /SHOW FIELDS/] def execute_with_query_record(sql, name = nil, &block) $queries_executed ||= [] |