Commit 0b080eee by Dan Collis-Puro

Fix #1292: Set content_type errors correctly on base

Content Type errors were incorrectly being set as an array on the base
attribute rather than being set individually as strings.
parent 203415c1
...@@ -17,7 +17,9 @@ module Paperclip ...@@ -17,7 +17,9 @@ module Paperclip
validate_blacklist(record, attribute, value) validate_blacklist(record, attribute, value)
if record.errors.include? attribute if record.errors.include? attribute
record.errors.add base_attribute, record.errors[attribute] record.errors[attribute].each do |error|
record.errors.add base_attribute, error
end
end end
end end
......
...@@ -61,6 +61,11 @@ class AttachmentContentTypeValidatorTest < Test::Unit::TestCase ...@@ -61,6 +61,11 @@ class AttachmentContentTypeValidatorTest < Test::Unit::TestCase
assert @dummy.errors[:avatar].present?, assert @dummy.errors[:avatar].present?,
"Error not added to base attribute" "Error not added to base attribute"
end end
should "add error to base object as a string" do
assert_kind_of String, @dummy.errors[:avatar].first,
"Error added to base attribute as something other than a String"
end
end end
context "with a successful validation" do context "with a successful validation" do
......
...@@ -45,6 +45,11 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase ...@@ -45,6 +45,11 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
"Error not added to base attribute" "Error not added to base attribute"
end end
should "add error to base object as a string" do
assert_kind_of String, @dummy.errors[:avatar].first,
"Error added to base attribute as something other than a String"
end
if options[:message] if options[:message]
should "return a correct error message" do should "return a correct error message" do
assert_includes @dummy.errors[:avatar_file_size], options[:message] assert_includes @dummy.errors[:avatar_file_size], options[:message]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment