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