Merge remote branch 'rails/master'

3 files changed, 18 insertions, 16 deletions

diff --git a/activemodel/test/models/developer.rb b/activemodel/test/models/developer.rb
deleted file mode 100644
index 5e6eefeed1..0000000000
--- a/activemodel/test/models/developer.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class Developer < ActiveRecord::Base
-  validates_inclusion_of :salary, :in => 50000..200000
-  validates_length_of :name, :within => 3..20
-
-  attr_accessor :name_confirmation
-end
diff --git a/activemodel/test/models/reply.rb b/activemodel/test/models/reply.rb
index e86692677f..ec1efeac19 100644
--- a/activemodel/test/models/reply.rb
+++ b/activemodel/test/models/reply.rb
@@ -2,33 +2,31 @@ require 'models/topic'
 
 class Reply < Topic
   validate :errors_on_empty_content
-  validate :title_is_wrong_create, :on => :create
+  validate :title_is_wrong_create,  :on => :create
 
   validate :check_empty_title
   validate :check_content_mismatch, :on => :create
-  validate :check_wrong_update, :on => :update
-
-  attr_accessible :title, :author_name, :author_email_address, :written_on, :content, :last_read
+  validate :check_wrong_update,     :on => :update
 
   def check_empty_title
-    errors[:title] << "Empty" unless attribute_present?("title")
+    errors[:title] << "is Empty" unless title && title.size > 0
   end
 
   def errors_on_empty_content
-    errors[:content] << "Empty" unless attribute_present?("content")
+    errors[:content] << "is Empty" unless content && content.size > 0
   end
 
   def check_content_mismatch
-    if attribute_present?("title") && attribute_present?("content") && content == "Mismatch"
+    if title && content && content == "Mismatch"
       errors[:title] << "is Content Mismatch"
     end
   end
 
   def title_is_wrong_create
-    errors[:title] << "is Wrong Create" if attribute_present?("title") && title == "Wrong Create"
+    errors[:title] << "is Wrong Create" if title && title == "Wrong Create"
   end
 
   def check_wrong_update
-    errors[:title] << "is Wrong Update" if attribute_present?("title") && title == "Wrong Update"
+    errors[:title] << "is Wrong Update" if title && title == "Wrong Update"
   end
 end
diff --git a/activemodel/test/models/topic.rb b/activemodel/test/models/topic.rb
index 1350aa17e7..f25b774cd7 100644
--- a/activemodel/test/models/topic.rb
+++ b/activemodel/test/models/topic.rb
@@ -1,4 +1,14 @@
-class Topic < ActiveRecord::Base
+class Topic
+  include ActiveModel::Validations
+
+  attr_accessor :title, :author_name, :content, :approved
+
+  def initialize(attributes = {})
+    attributes.each do |key, value|
+      send "#{key}=", value
+    end
+  end
+
   def condition_is_true
     true
   end