aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xactiverecord/lib/active_record/validations.rb1
-rw-r--r--activerecord/test/inflector_test.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index efb4368cc5..ab7176401d 100755
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -112,6 +112,7 @@ module ActiveRecord
end
end
+ # TODO: Write docs for me!
def validates_presence_of(*attr_names)
configuration = { :message => "can't be empty", :on => :save }
configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
diff --git a/activerecord/test/inflector_test.rb b/activerecord/test/inflector_test.rb
index e9684fc515..7bcff70bdd 100644
--- a/activerecord/test/inflector_test.rb
+++ b/activerecord/test/inflector_test.rb
@@ -47,7 +47,7 @@ class InflectorTest < Test::Unit::TestCase
CamelToUnderscore = {
"Product" => "product",
"SpecialGuest" => "special_guest",
- "AbstractApplicationController" => "abstract_application_controller"
+ "ApplicationController" => "application_controller"
}
ClassNameToForeignKeyWithUnderscore = {