Commit 5029a1d6 by Emil Sågfors

Fix nil errors in failure_message of content type validation matcher

When a matcher uses both `allowing` and `rejecting`, and validation fails,
`@missing_rejected_types` might still be `nil`.

When a matcher only uses either of the two, a part of the message is `nil`.
parent 8cd76a88
...@@ -40,9 +40,9 @@ module Paperclip ...@@ -40,9 +40,9 @@ module Paperclip
def failure_message def failure_message
"#{expected_attachment}\n".tap do |message| "#{expected_attachment}\n".tap do |message|
message << accepted_types_and_failures message << accepted_types_and_failures.to_s
message << "\n\n" if @allowed_types.present? && @rejected_types.present? message << "\n\n" if @allowed_types.present? && @rejected_types.present?
message << rejected_types_and_failures message << rejected_types_and_failures.to_s
end end
end end
...@@ -55,7 +55,7 @@ module Paperclip ...@@ -55,7 +55,7 @@ module Paperclip
def accepted_types_and_failures def accepted_types_and_failures
if @allowed_types.present? if @allowed_types.present?
"Accept content types: #{@allowed_types.join(", ")}\n".tap do |message| "Accept content types: #{@allowed_types.join(", ")}\n".tap do |message|
if @missing_allowed_types.any? if @missing_allowed_types.present?
message << " #{@missing_allowed_types.join(", ")} were rejected." message << " #{@missing_allowed_types.join(", ")} were rejected."
else else
message << " All were accepted successfully." message << " All were accepted successfully."
...@@ -66,7 +66,7 @@ module Paperclip ...@@ -66,7 +66,7 @@ module Paperclip
def rejected_types_and_failures def rejected_types_and_failures
if @rejected_types.present? if @rejected_types.present?
"Reject content types: #{@rejected_types.join(", ")}\n".tap do |message| "Reject content types: #{@rejected_types.join(", ")}\n".tap do |message|
if @missing_rejected_types.any? if @missing_rejected_types.present?
message << " #{@missing_rejected_types.join(", ")} were accepted." message << " #{@missing_rejected_types.join(", ")} were accepted."
else else
message << " All were rejected successfully." message << " All were rejected successfully."
......
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