Merge pull request #202 from Mth0158/201-existing-specs-started-failing

[Matcher] Fix misbehaviour on validate_content_type_of matcher (#201)

lib/active_storage_validations/matchers/content_type_validator_matcher.rb

@@ -35,7 +35,7 @@ def with_message(message)
 
       def matches?(subject)
         @subject = subject.is_a?(Class) ? subject.new : subject
-        responds_to_methods && allowed_types_allowed? && rejected_types_rejected? && validate_error_message?
+        responds_to_methods && allowed_types_allowed? && rejected_types_rejected? && validate_custom_message?
       end
 
       def failure_message
@@ -88,10 +88,12 @@ def type_allowed?(type)
         end
       end
 
-      def validate_error_message?
+      def validate_custom_message?
+        return true unless @custom_message
+
         @subject.public_send(@attribute_name).attach(attachment_for('fake/fake'))
         @subject.validate
-        @subject.errors.details[@attribute_name].all? do |error|
+        @subject.errors.details[@attribute_name].select{|error| error[:content_type]}.all? do |error|
           error[:error].to_s.include?(error_message)
         end
       end

test/dummy/app/models/user.rb

@@ -15,6 +15,7 @@ class User < ApplicationRecord
   has_one_attached :image_regex
   has_one_attached :conditional_image
   has_one_attached :conditional_image_2
+  has_one_attached :moon_picture
   has_one_attached :proc_avatar
   has_many_attached :proc_photos
   has_many_attached :proc_photo_with_messages
@@ -29,6 +30,8 @@ class User < ApplicationRecord
   validates :conditional_image, attached: true, if: -> { name == 'Foo' }
   validates :conditional_image_2, attached: true, content_type: -> (record) {[/\Aimage\/.*\z/]}, size: { less_than: 10.megabytes }, if: -> { name == 'Peter Griffin' }
 
+  validates :moon_picture, content_type: ['image/png'], size: { greater_than: 0 }
+
   validates :proc_avatar, attached: { message: "must not be blank" }, content_type: -> (record) {:png}
   validates :proc_photos, attached: true, content_type: -> (record) {['image/png', 'image/jpg', /\A.*\/pdf\z/]}
   validates :proc_photo_with_messages, content_type: { in: -> (record) {['image/png', 'image/jpg', /\A.*\/pdf\z/]}, message: "must be an authorized type" }

test/matchers/content_type_validator_matcher_test.rb

@@ -74,6 +74,12 @@ class ActiveStorageValidations::Matchers::ContentTypeValidatorMatcher::Test < Ac
     assert matcher.matches?(User)
   end
 
+  test 'matches when combined with a another validator which has errors (file size = 0)' do
+    matcher = ActiveStorageValidations::Matchers::ContentTypeValidatorMatcher.new(:moon_picture)
+    matcher.allowing('image/png')
+    assert matcher.matches?(User)
+  end
+
   class WithMessageMatcher < ActiveStorageValidations::Matchers::ContentTypeValidatorMatcher::Test
     test 'matches when provided with the model validation message' do
       matcher = ActiveStorageValidations::Matchers::ContentTypeValidatorMatcher.new(:photo_with_messages)