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/template/atom_feed_helper_test.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/template/atom_feed_helper_test.rb')
-rw-r--r-- | actionpack/test/template/atom_feed_helper_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/template/atom_feed_helper_test.rb b/actionpack/test/template/atom_feed_helper_test.rb index 89ff01ab0e..3acaecd142 100644 --- a/actionpack/test/template/atom_feed_helper_test.rb +++ b/actionpack/test/template/atom_feed_helper_test.rb @@ -1,7 +1,8 @@ require 'abstract_unit' class Scroll < Struct.new(:id, :to_param, :title, :body, :updated_at, :created_at) - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion def new_record? true |