aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-07-24 08:12:07 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2017-07-24 08:12:07 -0500
commitb2032888194ded868d22993c720ea1b03c4f754b (patch)
tree7a250247984cfe969e298ba79b5154e60896fcc7 /test
parentd8aec0f9a44c854038388e115660b20dbe49376e (diff)
parentd982aeed6b7715fe658d5afe522e91256f64cf3f (diff)
downloadrails-b2032888194ded868d22993c720ea1b03c4f754b.tar.gz
rails-b2032888194ded868d22993c720ea1b03c4f754b.tar.bz2
rails-b2032888194ded868d22993c720ea1b03c4f754b.zip
Merge branch 'master' of github.com:rails/activestorage
Diffstat (limited to 'test')
-rw-r--r--test/controllers/variants_controller_test.rb2
-rw-r--r--test/models/variant_test.rb4
2 files changed, 6 insertions, 0 deletions
diff --git a/test/controllers/variants_controller_test.rb b/test/controllers/variants_controller_test.rb
index 8d437bedbb..414eaa4ab6 100644
--- a/test/controllers/variants_controller_test.rb
+++ b/test/controllers/variants_controller_test.rb
@@ -12,6 +12,8 @@ class ActiveStorage::VariantsControllerTest < ActionController::TestCase
end
test "showing variant inline" do
+ skip
+
get :show, params: {
filename: @blob.filename,
signed_blob_id: @blob.signed_id,
diff --git a/test/models/variant_test.rb b/test/models/variant_test.rb
index 276bf7e4fc..6b386a8710 100644
--- a/test/models/variant_test.rb
+++ b/test/models/variant_test.rb
@@ -7,6 +7,8 @@ class ActiveStorage::VariantTest < ActiveSupport::TestCase
end
test "resized variation" do
+ skip
+
variant = @blob.variant(resize: "100x100").processed
assert_match /racecar.jpg/, variant.url
@@ -14,6 +16,8 @@ class ActiveStorage::VariantTest < ActiveSupport::TestCase
end
test "resized and monochrome variation" do
+ skip
+
variant = @blob.variant(resize: "100x100", monochrome: true).processed
assert_match /racecar.jpg/, variant.url