From 7c4457447e1136979e8ed9d822700c1041e9efa6 Mon Sep 17 00:00:00 2001 From: George Claghorn Date: Sat, 29 Dec 2018 07:24:56 -0500 Subject: Don't load Action Mailbox when Active Storage is skipped --- railties/lib/rails/generators/app_base.rb | 2 +- railties/test/generators/app_generator_test.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'railties') diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 1d79df4957..576f3be019 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -231,7 +231,7 @@ module Rails end def skip_action_mailbox? # :doc: - options[:skip_active_record] + skip_active_storage? end class GemfileEntry < Struct.new(:name, :version, :comment, :options, :commented_out) diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 123290b5e1..7d3b031416 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -440,6 +440,11 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "#{application_path}/config/application.rb", /#\s+require\s+["']action_mailbox\/engine["']/ end + def test_generator_skips_action_mailbox_when_skip_active_storage_is_given + run_generator [destination_root, "--skip-active-storage"] + assert_file "#{application_path}/config/application.rb", /#\s+require\s+["']action_mailbox\/engine["']/ + end + def test_app_update_does_not_change_config_target_version run_generator -- cgit v1.2.3