aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/activerecord
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-07-20 16:57:23 -0300
committerEmilio Tagua <miloops@gmail.com>2009-07-20 16:57:23 -0300
commit9a28bd787660b08aae36155066e61d3608d0b4dd (patch)
tree2d10dd32ad28cc070c3d142c45d6a35fcd5ae43e /actionpack/test/activerecord
parentb326faef0936e5a845d1f6eb9ed2200babfd05f8 (diff)
parent37658f15bb88e054635a496327a4a82bb50fd5d5 (diff)
downloadrails-9a28bd787660b08aae36155066e61d3608d0b4dd.tar.gz
rails-9a28bd787660b08aae36155066e61d3608d0b4dd.tar.bz2
rails-9a28bd787660b08aae36155066e61d3608d0b4dd.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/activerecord')
-rw-r--r--actionpack/test/activerecord/render_partial_with_record_identification_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb b/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
index 2a31f3be44..0122bc7d8f 100644
--- a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
+++ b/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
@@ -126,7 +126,7 @@ class RenderPartialWithRecordIdentificationController < ActionController::Base
end
class Game < Struct.new(:name, :id)
- extend ActiveModel::Naming
+ extend ActiveModel::APICompliant
def to_param
id.to_s
end