Merge commit 'rails/master'

1 files changed, 6 insertions, 3 deletions

diff --git a/actionpack/test/template/active_record_helper_test.rb b/actionpack/test/template/active_record_helper_test.rb
index c1bbdae8fb..b07ce6cf5d 100644
--- a/actionpack/test/template/active_record_helper_test.rb
+++ b/actionpack/test/template/active_record_helper_test.rb
@@ -5,15 +5,18 @@ class ActiveRecordHelperTest < ActionView::TestCase
 
   silence_warnings do
     class Post < Struct.new(:title, :author_name, :body, :secret, :written_on)
-      extend ActiveModel::APICompliant
+      extend ActiveModel::Naming
+      include ActiveModel::Conversion
     end
 
     class User < Struct.new(:email)
-      extend ActiveModel::APICompliant
+      extend ActiveModel::Naming
+      include ActiveModel::Conversion
     end
 
     class Column < Struct.new(:type, :name, :human_name)
-      extend ActiveModel::APICompliant
+      extend ActiveModel::Naming
+      include ActiveModel::Conversion
     end
   end