File tree Expand file tree Collapse file tree 3 files changed +16
-0
lines changed
lib/grape-active_model_serializers
spec/grape/active_model_serializers Expand file tree Collapse file tree 3 files changed +16
-0
lines changed Original file line number Diff line number Diff line change 33### 1.5.3 (Next)
44
55* Your contribution here.
6+ * [ #92 ] ( https://github.com/ruby-grape/grape-active_model_serializers/pull/92 ) : Fix: accept nil serializer - [ @mateusnava ] ( https://github.com/mateusnava ) .
67
78### 1.5.2 (March 14, 2018)
89
Original file line number Diff line number Diff line change @@ -16,6 +16,9 @@ def serializer
1616
1717 def serializer_class
1818 return @serializer_class if defined? ( @serializer_class )
19+
20+ return nil if options . key? ( :serializer ) && options [ :serializer ] . nil?
21+
1922 @serializer_class = resource_defined_class
2023 @serializer_class ||= collection_class
2124 @serializer_class ||= options [ :serializer ]
Original file line number Diff line number Diff line change 5252 expect ( serializer ) . to be_kind_of ( serializer_class )
5353 end
5454
55+ context 'specified nil by options' do
56+ let ( :options ) {
57+ super ( ) . merge (
58+ serializer : nil
59+ )
60+ }
61+
62+ it 'returns nil' do
63+ expect ( serializer ) . to be_nil
64+ end
65+ end
66+
5567 context 'each serializer' do
5668 let ( :options ) {
5769 super ( ) . except ( :serializer ) . merge (
You can’t perform that action at this time.
0 commit comments