File tree Expand file tree Collapse file tree 3 files changed +17
-1
lines changed
lib/grape-active_model_serializers
spec/grape/active_model_serializers Expand file tree Collapse file tree 3 files changed +17
-1
lines changed Original file line number Diff line number Diff line change 2
2
3
3
### 1.5.3 (Next)
4
4
5
- * Your contribution here.
5
+ * 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 ) .
6
7
7
8
### 1.5.2 (March 14, 2018)
8
9
Original file line number Diff line number Diff line change @@ -16,6 +16,9 @@ def serializer
16
16
17
17
def serializer_class
18
18
return @serializer_class if defined? ( @serializer_class )
19
+
20
+ return nil if options . has_key? ( :serializer ) && options [ :serializer ] . nil?
21
+
19
22
@serializer_class = resource_defined_class
20
23
@serializer_class ||= collection_class
21
24
@serializer_class ||= options [ :serializer ]
Original file line number Diff line number Diff line change 52
52
expect ( serializer ) . to be_kind_of ( serializer_class )
53
53
end
54
54
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
+
55
67
context 'each serializer' do
56
68
let ( :options ) {
57
69
super ( ) . except ( :serializer ) . merge (
You can’t perform that action at this time.
0 commit comments