diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
| commit | 33048b6e2738ff73b612dbcb35955189221dfbd0 (patch) | |
| tree | 7e32f6031199c1e7ee9a3e5a15789b5f568a565d /actionpack/test/lib | |
| parent | edda0bfe76fc9b2adcdb705665aaef2769e6ef03 (diff) | |
| parent | 9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff) | |
| download | rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.gz rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.bz2 rails-33048b6e2738ff73b612dbcb35955189221dfbd0.zip | |
Solving merge conflicts.
Diffstat (limited to 'actionpack/test/lib')
| -rw-r--r-- | actionpack/test/lib/controller/fake_models.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/lib/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb index 9e6f14d373..c6726432ec 100644 --- a/actionpack/test/lib/controller/fake_models.rb +++ b/actionpack/test/lib/controller/fake_models.rb @@ -2,6 +2,7 @@ require "active_model" class Customer < Struct.new(:name, :id) extend ActiveModel::Naming + include ActiveModel::Conversion def to_param id.to_s @@ -17,6 +18,7 @@ end module Quiz class Question < Struct.new(:name, :id) extend ActiveModel::Naming + include ActiveModel::Conversion def to_param id.to_s |