Merge pull request #388 from roolrool/feature/aspect-ratio-multiple-values-support

Add tests for supporting several passed aspect_ratios for allowing / rejecting methods

Author: Mth0158

README.md

@@ -787,8 +787,8 @@ Matcher methods available:
 describe User do
   # aspect_ratio:
   # #allowing, #rejecting
-  it { is_expected.to validate_aspect_ratio_of(:avatar).allowing(:square) }
-  it { is_expected.to validate_aspect_ratio_of(:avatar).rejecting(:portrait) }
+  it { is_expected.to validate_aspect_ratio_of(:avatar).allowing(:square, :portrait) } # possible to use an Array or *splatted array
+  it { is_expected.to validate_aspect_ratio_of(:avatar).rejecting(:square, :landscape) } # possible to use an Array or *splatted array
 
   # attached
   it { is_expected.to validate_attached_of(:avatar) }

test/dummy/app/models/aspect_ratio/matcher.rb

@@ -20,6 +20,10 @@ class AspectRatio::Matcher < ApplicationRecord
     has_one_attached :"allowing_one_#{aspect_ratio}"
     validates :"allowing_one_#{aspect_ratio}", aspect_ratio: aspect_ratio
   end
+
+  has_one_attached :allowing_several
+  validates :allowing_several, aspect_ratio: [ :square, :portrait ]
+
   has_one_attached :allowing_one_is_x_y
   validates :allowing_one_is_x_y, aspect_ratio: :is_16_9
 

test/matchers/aspect_ratio_validator_matcher_test.rb

@@ -109,6 +109,29 @@
         end
       end
     end
+
+    describe "several" do
+      describe "when all specified aspect ratios exactly match the allowed list" do
+        let(:model_attribute) { :allowing_several }
+        subject { matcher.allowing(:portrait, :square) }
+
+        it { is_expected_to_match_for(klass) }
+      end
+
+      describe "when some specified aspect ratios match but not all" do
+        let(:model_attribute) { :allowing_several }
+        subject { matcher.allowing(:landscape, :square) }
+
+        it { is_expected_not_to_match_for(klass) }
+      end
+
+      describe "when none of the specified aspect ratios match" do
+        let(:model_attribute) { :allowing_several }
+        subject { matcher.allowing(:landscape, :is_4_3) }
+
+        it { is_expected_not_to_match_for(klass) }
+      end
+    end
   end
 
   describe "#rejecting" do
@@ -172,6 +195,29 @@
         end
       end
     end
+
+    describe "several" do
+      describe "when rejecting aspect ratios that are not in the allowed list" do
+        let(:model_attribute) { :allowing_several }
+        subject { matcher.rejecting(:landscape, :square) }
+
+        it { is_expected_to_match_for(klass) }
+      end
+
+      describe "when rejecting some aspect ratios that overlap with the allowed list" do
+        let(:model_attribute) { :allowing_several }
+        subject { matcher.rejecting(:landscape, :square) }
+
+        it { is_expected_not_to_match_for(klass) }
+      end
+
+      describe "when rejecting aspect ratios that are in the allowed list" do
+        let(:model_attribute) { :allowing_several }
+        subject { matcher.rejecting(:square, :portrait) }
+
+        it { is_expected_not_to_match_for(klass) }
+      end
+    end
   end
 
   describe "Combinations" do