From 0dd7680fe515f2bbb4df7a79b3754c24a19d8d18 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Fri, 6 Jan 2017 23:04:21 -0500 Subject: [PATCH] Merge pull request #2019 from bf4/fix_method_redefined_warning Fix AMS warnings --- lib/generators/rails/resource_override.rb | 2 +- test/generators/serializer_generator_test.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/generators/rails/resource_override.rb b/lib/generators/rails/resource_override.rb index ebcba8df..5177a636 100644 --- a/lib/generators/rails/resource_override.rb +++ b/lib/generators/rails/resource_override.rb @@ -4,7 +4,7 @@ require 'rails/generators/rails/resource/resource_generator' module Rails module Generators class ResourceGenerator - hook_for :serializer, default: true, boolean: true + hook_for :serializer, default: true, type: :boolean end end end diff --git a/test/generators/serializer_generator_test.rb b/test/generators/serializer_generator_test.rb index 57625fc7..eef4a41e 100644 --- a/test/generators/serializer_generator_test.rb +++ b/test/generators/serializer_generator_test.rb @@ -67,6 +67,7 @@ class SerializerGeneratorTest < Rails::Generators::TestCase yield ensure String.class_eval do + undef_method :safe_constantize alias_method :safe_constantize, :old undef_method :old end