Revert "Merge branch 'context'"

This reverts commit 1bd8180a94, reversing
changes made to 9bb32331f4.

test/unit/active_model/array_serializer/context_test.rb

@@ -1,38 +0,0 @@
-require 'test_helper'
-
-module ActiveModel
-  class ArraySerializer
-    class ContextTest < ActiveModel::TestCase
-      def test_context_using_a_hash
-        serializer = ArraySerializer.new(nil, context: { a: 1, b: 2 })
-        assert_equal(1, serializer.context[:a])
-        assert_equal(2, serializer.context[:b])
-      end
-
-      def test_context_using_an_object
-        serializer = ArraySerializer.new(nil, context: Struct.new(:a, :b).new(1, 2))
-        assert_equal(1, serializer.context.a)
-        assert_equal(2, serializer.context.b)
-      end
-    end
-
-    class ScopeTest < ActiveModel::TestCase
-      def test_array_serializer_pass_context_to_item_serializers
-        array = [Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),
-                 Profile.new({ name: 'Name 2', description: 'Description 2', comments: 'Comments 2' })]
-        serializer = ArraySerializer.new(array, context: { scope: current_user })
-
-        expected = [{ name: 'Name 1', description: 'Description 1 - user' },
-                    { name: 'Name 2', description: 'Description 2 - user' }]
-
-        assert_equal expected, serializer.serializable_array
-      end
-
-      private
-
-      def current_user
-        'user'
-      end
-    end
-  end
-end

test/unit/active_model/array_serializer/scope_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+module ActiveModel
+  class ArraySerializer
+    class ScopeTest < ActiveModel::TestCase
+      def test_array_serializer_pass_options_to_items_serializers
+        array = [Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),
+                 Profile.new({ name: 'Name 2', description: 'Description 2', comments: 'Comments 2' })]
+        serializer = ArraySerializer.new(array, scope: current_user)
+
+        expected = [{ name: 'Name 1', description: 'Description 1 - user' },
+                    { name: 'Name 2', description: 'Description 2 - user' }]
+
+        assert_equal expected, serializer.serializable_array
+      end
+
+      private
+
+      def current_user
+        'user'
+      end
+    end
+  end
+end

test/unit/active_model/serializer/scope_test.rb

@@ -2,45 +2,48 @@ require 'test_helper'
 
 module ActiveModel
   class Serializer
-    class ContextTest < ActiveModel::TestCase
-      def test_context_using_a_hash
-        serializer = UserSerializer.new(nil, context: { a: 1, b: 2 })
-        assert_equal(1, serializer.context[:a])
-        assert_equal(2, serializer.context[:b])
+    class ScopeTest < ActiveModel::TestCase
+      def setup
+        @serializer = ProfileSerializer.new(nil, scope: current_user)
       end
 
-      def test_context_using_an_object
-        serializer = UserSerializer.new(nil, context: Struct.new(:a, :b).new(1, 2))
-        assert_equal(1, serializer.context.a)
-        assert_equal(2, serializer.context.b)
+      def test_scope
+        assert_equal('user', @serializer.scope)
+      end
+
+      private
+
+      def current_user
+        'user'
       end
     end
 
-    class ContextAssociationTest < ActiveModel::TestCase
+    class NestedScopeTest < ActiveModel::TestCase
       def setup
         @association = UserSerializer._associations[:profile]
         @old_association = @association.dup
         @user = User.new({ name: 'Name 1', email: 'mail@server.com', gender: 'M' })
-        @user_serializer = UserSerializer.new(@user, context: { admin: true })
+        @user_serializer = UserSerializer.new(@user, scope: 'user')
       end
 
       def teardown
         UserSerializer._associations[:profile] = @old_association
       end
 
-      def test_context_passed_through
+      def test_scope_passed_through
         @association.serializer_class = Class.new(ActiveModel::Serializer) do
           def name
-            context[:admin] ? 'Admin' : 'User'
+            scope
           end
 
           attributes :name
         end
 
         assert_equal({
-          name: 'Name 1', email: 'mail@server.com', profile: { name: 'Admin' }
+          name: 'Name 1', email: 'mail@server.com', profile: { name: 'user' }
         }, @user_serializer.serializable_hash)
       end
     end
+
   end
 end