aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/deprecated_associations_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-09-09 08:32:47 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-09-09 08:32:47 +0000
commit0439769324ef889e5e353caacb92a025a8ce2629 (patch)
tree751d9335a145f92d2b2da24957de0ba5760d2e41 /activerecord/test/deprecated_associations_test.rb
parent558331596fbf9139ef529b14d50c6e258e63fb67 (diff)
downloadrails-0439769324ef889e5e353caacb92a025a8ce2629.tar.gz
rails-0439769324ef889e5e353caacb92a025a8ce2629.tar.bz2
rails-0439769324ef889e5e353caacb92a025a8ce2629.zip
Refactored away all the legacy validate_options calls and replaced them with Hash#assert_valid_keys
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2167 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/deprecated_associations_test.rb')
-rwxr-xr-xactiverecord/test/deprecated_associations_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/deprecated_associations_test.rb b/activerecord/test/deprecated_associations_test.rb
index 9f4894beca..1d5908d774 100755
--- a/activerecord/test/deprecated_associations_test.rb
+++ b/activerecord/test/deprecated_associations_test.rb
@@ -9,7 +9,7 @@ require 'fixtures/reply'
bad_collection_keys = false
begin
class Car < ActiveRecord::Base; has_many :wheels, :name => "wheels"; end
-rescue ActiveRecord::ActiveRecordError
+rescue ArgumentError
bad_collection_keys = true
end
raise "ActiveRecord should have barked on bad collection keys" unless bad_collection_keys