Fix active model tests

eileencodes · eileencodes · commit 8baed8cfa4ab · 2018-12-21T13:30:22.000-05:00
diff --git a/activesupport/lib/active_support/json/as_json_encoder.rb b/activesupport/lib/active_support/json/as_json_encoder.rb
@@ -22,7 +22,13 @@ def encode(object)
         if AsJSONEncoder.internal_as_json?(object)
           visit object
         else
-          encode object.as_json
+          # **ONLY** top level objects implementing as_json should
+          # get the options hash
+          if !@as_json_options.nil?
+            self.class.new(nil).encode object.as_json(@as_json_options.dup)
+          else
+            self.class.new(nil).encode object.as_json
+          end
         end
       end
 
