From c3844a9dc0a4432c5dc50aa2fbfd705bc09fd725 Mon Sep 17 00:00:00 2001 From: Hartley McGuire Date: Tue, 8 Mar 2022 15:36:24 -0500 Subject: [PATCH] fix rubocop errors Using `bundle exec rubocop -a` and visually verified --- .../transformers/image_processing_transformer.rb | 2 +- activestorage/test/models/variant_test.rb | 8 ++++---- railties/test/application/configuration_test.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/activestorage/lib/active_storage/transformers/image_processing_transformer.rb b/activestorage/lib/active_storage/transformers/image_processing_transformer.rb index a5182aefe2..6b281a7aef 100644 --- a/activestorage/lib/active_storage/transformers/image_processing_transformer.rb +++ b/activestorage/lib/active_storage/transformers/image_processing_transformer.rb @@ -340,7 +340,7 @@ def operations end def validate_transformation(name, argument) - method_name = name.to_s.gsub("-","_") + method_name = name.to_s.tr("-", "_") unless SUPPORTED_IMAGE_PROCESSING_METHODS.any? { |method| method_name == method } raise UnsupportedImageProcessingMethod, <<~ERROR.squish diff --git a/activestorage/test/models/variant_test.rb b/activestorage/test/models/variant_test.rb index 338c209e91..99730be6b2 100644 --- a/activestorage/test/models/variant_test.rb +++ b/activestorage/test/models/variant_test.rb @@ -237,7 +237,7 @@ class ActiveStorage::VariantTest < ActiveSupport::TestCase end assert_raise(ActiveStorage::Transformers::ImageProcessingTransformer::UnsupportedImageProcessingArgument) do - blob.variant(resize: [123, {"-write /tmp/file.erb": "something"}, "/tmp/file.erb"]).processed + blob.variant(resize: [123, { "-write /tmp/file.erb": "something" }, "/tmp/file.erb"]).processed end end end @@ -246,7 +246,7 @@ class ActiveStorage::VariantTest < ActiveSupport::TestCase process_variants_with :mini_magick do blob = create_file_blob(filename: "racecar.jpg") assert_raise(ActiveStorage::Transformers::ImageProcessingTransformer::UnsupportedImageProcessingArgument) do - blob.variant(saver: {"-write": "/tmp/file.erb"}).processed + blob.variant(saver: { "-write": "/tmp/file.erb" }).processed end end end @@ -255,11 +255,11 @@ class ActiveStorage::VariantTest < ActiveSupport::TestCase process_variants_with :mini_magick do blob = create_file_blob(filename: "racecar.jpg") assert_raise(ActiveStorage::Transformers::ImageProcessingTransformer::UnsupportedImageProcessingArgument) do - blob.variant(saver: {"something": {"-write": "/tmp/file.erb"}}).processed + blob.variant(saver: { "something": { "-write": "/tmp/file.erb" } }).processed end assert_raise(ActiveStorage::Transformers::ImageProcessingTransformer::UnsupportedImageProcessingArgument) do - blob.variant(saver: {"something": ["-write", "/tmp/file.erb"]}).processed + blob.variant(saver: { "something": ["-write", "/tmp/file.erb"] }).processed end end end diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index eef3c345de..af151d09ba 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -3136,7 +3136,7 @@ class MyLogger < ::Logger app "development" assert ActiveStorage.unsupported_image_processing_arguments.include?("-danger") - refute ActiveStorage.unsupported_image_processing_arguments.include?("-set") + assert_not ActiveStorage.unsupported_image_processing_arguments.include?("-set") end test "hosts include .localhost in development" do