From a20d5bd1e3f96b108b4c22c0962c326133f43cd4 Mon Sep 17 00:00:00 2001 From: Haroon Ahmed Date: Thu, 18 Jun 2020 17:15:21 +0100 Subject: [PATCH] Remove unknown_asset_fallback check from test_new_application_load_defaults as it adds no value to the generator tests, this speeds up the test from ~5s to ~0.1s. The unknown_asset_fallback test has been moved into the configuration_test.rb --- railties/test/application/configuration_test.rb | 6 ++++++ railties/test/generators/app_generator_test.rb | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index acaec7db4b..45d2082953 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -2614,6 +2614,12 @@ module ApplicationTests assert_equal true, Rails.application.config.rake_eager_load end + test "unknown_asset_fallback is false by default" do + app "development" + + assert_equal false, Rails.application.config.assets.unknown_asset_fallback + end + private def set_custom_config(contents, config_source = "custom".inspect) app_file "config/custom.yml", contents diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 396741e78a..2baa0ff310 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -207,16 +207,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_new_application_load_defaults app_root = File.join(destination_root, "myfirstapp") run_generator [app_root] - - output = nil - assert_file "#{app_root}/config/application.rb", /\s+config\.load_defaults #{Rails::VERSION::STRING.to_f}/ - - Dir.chdir(app_root) do - output = `SKIP_REQUIRE_WEBPACKER=true ./bin/rails r "puts Rails.application.config.assets.unknown_asset_fallback"` - end - - assert_equal "false\n", output end def test_csp_initializer_include_connect_src_example