Merge branch 'master' of https://github.com/rails/rails

1 files changed, 21 insertions, 0 deletions

diff --git a/activemodel/test/models/topic.rb b/activemodel/test/models/topic.rb
index f25b774cd7..c9af78f595 100644
--- a/activemodel/test/models/topic.rb
+++ b/activemodel/test/models/topic.rb
@@ -1,7 +1,15 @@
 class Topic
   include ActiveModel::Validations
+  include ActiveModel::Validations::Callbacks
+
+  def self._validates_default_keys
+    super | [ :message ]
+  end
 
   attr_accessor :title, :author_name, :content, :approved
+  attr_accessor :after_validation_performed
+
+  after_validation :perform_after_validation
 
   def initialize(attributes = {})
     attributes.each do |key, value|
@@ -16,4 +24,17 @@ class Topic
   def condition_is_true_but_its_not
     false
   end
+
+  def perform_after_validation
+    self.after_validation_performed = true
+  end
+
+  def my_validation
+    errors.add :title, "is missing" unless title
+  end
+
+  def my_validation_with_arg(attr)
+    errors.add attr, "is missing" unless send(attr)
+  end
+
 end