diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-07-20 16:57:23 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-07-20 16:57:23 -0300 |
commit | 9a28bd787660b08aae36155066e61d3608d0b4dd (patch) | |
tree | 2d10dd32ad28cc070c3d142c45d6a35fcd5ae43e /actionpack/test/lib/controller | |
parent | b326faef0936e5a845d1f6eb9ed2200babfd05f8 (diff) | |
parent | 37658f15bb88e054635a496327a4a82bb50fd5d5 (diff) | |
download | rails-9a28bd787660b08aae36155066e61d3608d0b4dd.tar.gz rails-9a28bd787660b08aae36155066e61d3608d0b4dd.tar.bz2 rails-9a28bd787660b08aae36155066e61d3608d0b4dd.zip |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/lib/controller')
-rw-r--r-- | actionpack/test/lib/controller/fake_models.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/lib/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb index 9e6f14d373..07f01e1c47 100644 --- a/actionpack/test/lib/controller/fake_models.rb +++ b/actionpack/test/lib/controller/fake_models.rb @@ -1,7 +1,7 @@ require "active_model" class Customer < Struct.new(:name, :id) - extend ActiveModel::Naming + extend ActiveModel::APICompliant def to_param id.to_s @@ -16,7 +16,7 @@ end module Quiz class Question < Struct.new(:name, :id) - extend ActiveModel::Naming + extend ActiveModel::APICompliant def to_param id.to_s |