ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 15:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'context'"

Browse Source 
This reverts commit 1bd8180a94, reversing
changes made to 9bb32331f4.
This commit is contained in:
Santiago Pastorino
2014-01-07 15:02:09 -02:00
parent 1bd8180a94
commit ed9a5288f9
8 changed files with 51 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/action_controller/serialization_test.rb
View File

@@ -43,7 +43,7 @@ module ActionController
class DefaultOptionsForSerializerScopeTest < ActionController::TestCase
class MyController < ActionController::Base
def default_serializer_options
{ context: { scope: current_admin } }
{ scope: current_admin }
end
def render_using_scope_set_in_default_serializer_options
@@ -73,7 +73,7 @@ module ActionController
class ExplicitSerializerScopeTest < ActionController::TestCase
class MyController < ActionController::Base
def render_using_implicit_serializer_and_explicit_scope
render json: Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }), context: { scope: current_admin }
render json: Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }), scope: current_admin
end
private