1 files changed, 17 insertions, 16 deletions
diff --git a/actionpack/test/lib/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb
index 7346cb22bc..bf3e175f1f 100644
--- a/actionpack/test/lib/controller/fake_models.rb
+++ b/actionpack/test/lib/controller/fake_models.rb
@@ -6,10 +6,6 @@ class Customer < Struct.new(:name, :id)
 
   undef_method :to_json
 
-  def to_param
-    id.to_s
-  end
-
   def to_xml(options={})
     if options[:builder]
       options[:builder].name name
@@ -21,13 +17,14 @@ class Customer < Struct.new(:name, :id)
   def to_js(options={})
     "name: #{name.inspect}"
   end
+  alias :to_text :to_js
 
   def errors
     []
   end
 
-  def destroyed?
-    false
+  def persisted?
+    id.present?
   end
 end
 
@@ -42,8 +39,8 @@ module Quiz
     extend ActiveModel::Naming
     include ActiveModel::Conversion
 
-    def to_param
-      id.to_s
+    def persisted?
+      id.present?
     end
   end
 
@@ -58,12 +55,12 @@ class Post < Struct.new(:title, :author_name, :body, :secret, :written_on, :cost
 
   alias_method :secret?, :secret
 
-  def new_record=(boolean)
-    @new_record = boolean
+  def persisted=(boolean)
+    @persisted = boolean
   end
 
-  def new_record?
-    @new_record
+  def persisted?
+    @persisted
   end
 
   attr_accessor :author
@@ -83,8 +80,9 @@ class Comment
   attr_reader :id
   attr_reader :post_id
   def initialize(id = nil, post_id = nil); @id, @post_id = id, post_id end
+  def to_key; id ? [id] : nil end
   def save; @id = 1; @post_id = 1 end
-  def new_record?; @id.nil? end
+  def persisted?; @id.present? end
   def to_param; @id; end
   def name
     @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"
@@ -102,8 +100,9 @@ class Tag
   attr_reader :id
   attr_reader :post_id
   def initialize(id = nil, post_id = nil); @id, @post_id = id, post_id end
+  def to_key; id ? [id] : nil end
   def save; @id = 1; @post_id = 1 end
-  def new_record?; @id.nil? end
+  def persisted?; @id.present? end
   def to_param; @id; end
   def value
     @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"
@@ -121,8 +120,9 @@ class CommentRelevance
   attr_reader :id
   attr_reader :comment_id
   def initialize(id = nil, comment_id = nil); @id, @comment_id = id, comment_id end
+  def to_key; id ? [id] : nil end
   def save; @id = 1; @comment_id = 1 end
-  def new_record?; @id.nil? end
+  def persisted?; @id.present? end
   def to_param; @id; end
   def value
     @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"
@@ -136,8 +136,9 @@ class TagRelevance
   attr_reader :id
   attr_reader :tag_id
   def initialize(id = nil, tag_id = nil); @id, @tag_id = id, tag_id end
+  def to_key; id ? [id] : nil end
   def save; @id = 1; @tag_id = 1 end
-  def new_record?; @id.nil? end
+  def persisted?; @id.present? end
   def to_param; @id; end
   def value
     @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"