Skip to content

Commit 80c38d6

Browse files
authored
Merge pull request rails#54171 from Earlopain/variant_processor_nil
Ensure that `ActiveStorage.analyzers` doesn't contain nil
2 parents ce683cb + 051f9be commit 80c38d6

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

activestorage/lib/active_storage/engine.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class Engine < Rails::Engine # :nodoc:
102102
]
103103
end
104104

105-
ActiveStorage.analyzers = [analyzer].concat(app.config.active_storage.analyzers || [])
105+
ActiveStorage.analyzers = [analyzer].compact.concat(app.config.active_storage.analyzers || [])
106106
ActiveStorage.variant_transformer = transformer
107107
rescue LoadError => error
108108
case error.message

railties/test/application/configuration_test.rb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3931,6 +3931,14 @@ class Post < ActiveRecord::Base
39313931
assert_equal :vips, ActiveStorage.variant_processor
39323932
end
39333933

3934+
test "ActiveStorage.analyzers doesn't contain nil when variant_processor = nil" do
3935+
add_to_config "config.active_storage.variant_processor = nil"
3936+
3937+
app "development"
3938+
3939+
assert_not_includes ActiveStorage.analyzers, nil
3940+
end
3941+
39343942
test "ActiveStorage.supported_image_processing_methods can be configured via config.active_storage.supported_image_processing_methods" do
39353943
remove_from_config '.*config\.load_defaults.*\n'
39363944

0 commit comments

Comments
 (0)