[Validator] Add extra tests for dimension validator and update matcher

test/dummy/app/models/dimension/validator/check.rb

@@ -42,6 +42,13 @@ class Dimension::Validator::Check < ApplicationRecord
     validates :"#{bound}_proc", dimension: { "#{bound}": -> (record) { 500..500 } }
   end
 
+  # Integration tests
+  has_one_attached :width_height_exact
+  validates :width_height_exact, dimension: { width: 600, height: 600 }
+  has_one_attached :width_height_in
+  validates :width_height_in, dimension: { width: { in: 550..750 }, height: { in: 550..750 } }
+
+  # Edge cases
   has_one_attached :with_invalid_media_file
   validates :with_invalid_media_file, dimension: { width: 150, height: 150 }
 end

test/support/files.rb

@@ -24,6 +24,22 @@ def image_500x500_file
   }
 end
 
+def image_600x600_file
+  {
+    io: File.open(Rails.root.join('public', 'image_600x600.png')),
+    filename: 'image_600x600_file.png',
+    content_type: 'image/png'
+  }
+end
+
+def image_500x700_file
+  {
+    io: File.open(Rails.root.join('public', 'image_500x700.png')),
+    filename: 'image_500x700_file.png',
+    content_type: 'image/png'
+  }
+end
+
 def image_700x500_file
   {
     io: File.open(Rails.root.join('public', 'image_700x500.png')),

test/validators/aspect_ratio_validator_test.rb

@@ -151,7 +151,7 @@
                 end
 
                 it { is_expected_not_to_be_valid }
-                it { is_expected_to_have_error_message("aspect_ratio_not_#{named_aspect_ratio}", error_options: error_options) }
+                it { is_expected_to_include_error_message("aspect_ratio_not_#{named_aspect_ratio}", error_options: error_options) }
                 it { is_expected_to_have_error_options(error_options) }
               end
             end
@@ -183,7 +183,7 @@
             end
 
             it { is_expected_not_to_be_valid }
-            it { is_expected_to_have_error_message("aspect_ratio_not_x_y", error_options: error_options) }
+            it { is_expected_to_include_error_message("aspect_ratio_not_x_y", error_options: error_options) }
             it { is_expected_to_have_error_options(error_options) }
           end
         end
@@ -218,7 +218,7 @@
             end
 
             it { is_expected_not_to_be_valid }
-            it { is_expected_to_have_error_message('aspect_ratio_invalid', error_options: error_options) }
+            it { is_expected_to_include_error_message('aspect_ratio_invalid', error_options: error_options) }
             it { is_expected_to_have_error_options(error_options) }
           end
         end
@@ -237,7 +237,7 @@
         end
 
         it { is_expected_not_to_be_valid }
-        it { is_expected_to_have_error_message("media_metadata_missing", error_options: error_options) }
+        it { is_expected_to_include_error_message("media_metadata_missing", error_options: error_options) }
         it { is_expected_to_have_error_options(error_options) }
       end
     end

test/validators/attached_validator_test.rb

@@ -34,15 +34,15 @@
       subject { model }
 
       it { is_expected_not_to_be_valid }
-      it { is_expected_to_have_error_message("blank", error_options: {}) }
+      it { is_expected_to_include_error_message("blank", error_options: {}) }
     end
 
     describe 'when provided with a file that is marked for destruction' do
       # validates :has_to_be_attached, attached: true
       subject { model.has_to_be_attached.attach(image_1920x1080_file) and model.has_to_be_attached.mark_for_destruction and model }
 
       it { is_expected_not_to_be_valid }
-      it { is_expected_to_have_error_message("blank", error_options: {}) }
+      it { is_expected_to_include_error_message("blank", error_options: {}) }
     end
   end
 

test/validators/content_type_validator_test.rb

@@ -130,7 +130,7 @@
     #     end
 
     #     it { is_expected_not_to_be_valid }
-    #     it { is_expected_to_have_error_message("content_type_invalid", error_options: error_options) }
+    #     it { is_expected_to_include_error_message("content_type_invalid", error_options: error_options) }
     #     it { is_expected_to_have_error_options(error_options) }
     #   end
 
@@ -153,7 +153,7 @@
     #       end
 
     #       it { is_expected_not_to_be_valid }
-    #       it { is_expected_to_have_error_message("content_type_invalid", error_options: error_options) }
+    #       it { is_expected_to_include_error_message("content_type_invalid", error_options: error_options) }
     #       it { is_expected_to_have_error_options(error_options) }
     #     end
 
@@ -203,7 +203,7 @@
     #     end
 
     #     it { is_expected_not_to_be_valid }
-    #     it { is_expected_to_have_error_message("content_type_invalid", error_options: error_options) }
+    #     it { is_expected_to_include_error_message("content_type_invalid", error_options: error_options) }
     #     it { is_expected_to_have_error_options(error_options) }
     #   end
     # end
@@ -244,7 +244,7 @@
                 end
 
                 it { is_expected_not_to_be_valid }
-                it { is_expected_to_have_error_message("content_type_invalid", error_options: error_options) }
+                it { is_expected_to_include_error_message("content_type_invalid", error_options: error_options) }
                 it { is_expected_to_have_error_options(error_options) }
               end
             end
@@ -289,7 +289,7 @@
                 end
 
                 it { is_expected_not_to_be_valid }
-                it { is_expected_to_have_error_message("content_type_invalid", error_options: error_options) }
+                it { is_expected_to_include_error_message("content_type_invalid", error_options: error_options) }
                 it { is_expected_to_have_error_options(error_options) }
               end
             end
@@ -353,7 +353,7 @@
           end
 
           it { is_expected_not_to_be_valid }
-          it { is_expected_to_have_error_message("content_type_spoofed", error_options: error_options, validator: :content_type) }
+          it { is_expected_to_include_error_message("content_type_spoofed", error_options: error_options, validator: :content_type) }
           it { is_expected_to_have_error_options(error_options, validator: :content_type) }
         end
 
@@ -375,7 +375,7 @@
           end
 
           it { is_expected_not_to_be_valid }
-          it { is_expected_to_have_error_message("content_type_spoofed", error_options: error_options, validator: :content_type) }
+          it { is_expected_to_include_error_message("content_type_spoofed", error_options: error_options, validator: :content_type) }
           it { is_expected_to_have_error_options(error_options, validator: :content_type) }
         end
 
@@ -397,7 +397,7 @@
           end
 
           it { is_expected_not_to_be_valid }
-          it { is_expected_to_have_error_message("content_type_spoofed", error_options: error_options, validator: :content_type) }
+          it { is_expected_to_include_error_message("content_type_spoofed", error_options: error_options, validator: :content_type) }
           it { is_expected_to_have_error_options(error_options, validator: :content_type) }
         end
 
@@ -457,7 +457,7 @@
             end
 
             it { is_expected_not_to_be_valid }
-            it { is_expected_to_have_error_message("content_type_spoofed", error_options: error_options, validator: :content_type) }
+            it { is_expected_to_include_error_message("content_type_spoofed", error_options: error_options, validator: :content_type) }
             it { is_expected_to_have_error_options(error_options, validator: :content_type) }
           end
         end