tests for namespaced controlleler

lib/active_model/array_serializer.rb

@@ -39,7 +39,7 @@ module ActiveModel
 
     def serializable_object
       @object.map do |item|
-        serializer_for(item).serializable_object
+        serializer_for(item).serializable_object_with_notification
       end
     end
     alias_method :serializable_array, :serializable_object

lib/active_model/serializable.rb

@@ -12,6 +12,12 @@ module ActiveModel
       end
     end
 
+    def serializable_object_with_notification
+      instrument('!serialize') do
+        serializable_object
+      end
+    end
+
     def serializable_data
       embedded_in_root_associations.tap do |hash|
         if respond_to?(:meta) && meta

test/fixtures/poro.rb

@@ -73,3 +73,12 @@ end
 class WebLogLowerCamelSerializer < WebLogSerializer
   format_keys :lower_camel
 end
+
+class ShortUserSerializer < ActiveModel::Serializer
+  attributes :name
+end
+
+module TestNamespace
+  class ProfileSerializer < ::ProfileSerializer; end
+  class UserSerializer    < ::UserSerializer;    end
+end

test/integration/action_controller/namespaced_serialization_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+module ActionController
+  module Serialization
+    class NamespacedSerializationTest < ActionController::TestCase
+      class TestNamespace::MyController < ActionController::Base
+        def render_profile_with_namespace
+          render json: Profile.new({ name: 'Name 1', description: 'Description 1'})
+        end
+
+        def render_profiles_with_namespace
+          render json: [Profile.new({ name: 'Name 1', description: 'Description 1'})]
+        end
+
+        def render_comment
+          render json: Comment.new(content: 'Comment 1')
+        end
+
+        def render_comments
+          render json: [Comment.new(content: 'Comment 1')]
+        end
+      end
+
+      tests TestNamespace::MyController
+
+      def test_render_profile_with_namespace
+        get :render_profile_with_namespace
+        assert_serializer TestNamespace::ProfileSerializer
+      end
+
+      def test_render_profiles_with_namespace
+        get :render_profiles_with_namespace
+        assert_serializer TestNamespace::ProfileSerializer
+      end
+
+      def test_fallback_to_a_version_without_namespace
+        get :render_comment
+        assert_serializer CommentSerializer
+      end
+
+      def test_array_fallback_to_a_version_without_namespace
+        get :render_comments
+        assert_serializer CommentSerializer
+      end
+    end
+  end
+end