aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/record_identifier_test.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-07-21 11:27:23 -0300
committerEmilio Tagua <miloops@gmail.com>2009-07-21 11:27:23 -0300
commitf32c3709830eb8d9f68a59c94f6791621c2b52ac (patch)
treeb34cf0b9321dfd40b795cc761b158be4cbde48f6 /actionpack/test/controller/record_identifier_test.rb
parent9a28bd787660b08aae36155066e61d3608d0b4dd (diff)
parent9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff)
downloadrails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.tar.gz
rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.tar.bz2
rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/controller/record_identifier_test.rb')
-rw-r--r--actionpack/test/controller/record_identifier_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/controller/record_identifier_test.rb b/actionpack/test/controller/record_identifier_test.rb
index 10f51639cf..44e49ed3f8 100644
--- a/actionpack/test/controller/record_identifier_test.rb
+++ b/actionpack/test/controller/record_identifier_test.rb
@@ -1,7 +1,8 @@
require 'abstract_unit'
class Comment
- extend ActiveModel::APICompliant
+ extend ActiveModel::Naming
+ include ActiveModel::Conversion
attr_reader :id
def save; @id = 1 end