aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-07-21 16:45:55 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2017-07-21 16:45:55 -0500
commitf3b092a6e6f6d873e14ebe1e612028ef7ac15e4a (patch)
tree625c596233458216177836fd0e159557c2541adb
parente9cf92cc399a169ec47496da198cfb984856000d (diff)
downloadrails-f3b092a6e6f6d873e14ebe1e612028ef7ac15e4a.tar.gz
rails-f3b092a6e6f6d873e14ebe1e612028ef7ac15e4a.tar.bz2
rails-f3b092a6e6f6d873e14ebe1e612028ef7ac15e4a.zip
Test actual transformation via controller too
-rw-r--r--test/controllers/variants_controller.rb1
-rw-r--r--test/test_helper.rb6
-rw-r--r--test/variant_test.rb7
3 files changed, 7 insertions, 7 deletions
diff --git a/test/controllers/variants_controller.rb b/test/controllers/variants_controller.rb
index 22f5ec1454..6753584d4d 100644
--- a/test/controllers/variants_controller.rb
+++ b/test/controllers/variants_controller.rb
@@ -19,5 +19,6 @@ class ActiveStorage::VariantsControllerTest < ActionController::TestCase
variation_key: ActiveStorage::Variation.encode(resize: "100x100") }
assert_redirected_to /racecar.jpg\?disposition=inline/
+ assert_same_image "racecar-100x100.jpg", @blob.variant(resize: "100x100")
end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 69ba76b9c4..20b22049b3 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -39,6 +39,12 @@ class ActiveSupport::TestCase
io: File.open(File.expand_path("../fixtures/files/#{filename}", __FILE__)),
filename: filename, content_type: content_type
end
+
+ def assert_same_image(fixture_filename, variant)
+ assert_equal \
+ File.binread(File.expand_path("../fixtures/files/#{fixture_filename}", __FILE__)),
+ File.binread(variant.service.send(:path_for, variant.key))
+ end
end
require "action_controller"
diff --git a/test/variant_test.rb b/test/variant_test.rb
index e41842a80c..5294b87135 100644
--- a/test/variant_test.rb
+++ b/test/variant_test.rb
@@ -20,11 +20,4 @@ class ActiveStorage::VariantTest < ActiveSupport::TestCase
assert_match /racecar.jpg/, variant.url
assert_same_image "racecar-100x100-monochrome.jpg", variant
end
-
- private
- def assert_same_image(fixture_filename, variant)
- assert_equal \
- File.binread(File.expand_path("../fixtures/files/#{fixture_filename}", __FILE__)),
- File.binread(variant.service.send(:path_for, variant.key))
- end
end