Merge f969144 into 8ca4d4f

lib/active_model/serializer.rb

@@ -108,8 +108,9 @@ def initialize(object, options={})
       @meta_key      = options[:meta_key] || :meta
       @meta          = options[@meta_key]
       @wrap_in_array = options[:_wrap_in_array]
+      @context       = options[:context]
     end
-    attr_accessor :object, :scope, :root, :meta_key, :meta
+    attr_accessor :object, :scope, :root, :meta_key, :meta, :context
 
     def json_key
       if root == true || root.nil?

test/unit/active_model/serializer/options_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+module ActiveModel
+  class Serializer
+    class OptionsTest < Minitest::Test
+      def setup
+        @serializer = ProfileSerializer.new(nil, context: {foo: :bar})
+      end
+
+      def test_custom_options_are_accessible_from_serializer
+        assert_equal({foo: :bar}, @serializer.context)
+      end
+    end
+  end
+end