validation_matcher 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16e7a986b13eb0f10dea0235be0abcaf46b97519
-  data.tar.gz: f97b1d7823440f7190b64933975039199d98b42c
+  metadata.gz: 2256f5aae95d9a85c63454d483aa53d63b920579
+  data.tar.gz: 9b7f1c07918b26a57646055107d523b95330016c
 SHA512:
-  metadata.gz: 2f304d374fbac5c2fe71d24720f151d9c3422aa7ef34918381db4aea93aa62954fd173669db069f983e70915f328cd13a3ac2433e337a9b4878478a21d112926
-  data.tar.gz: ea3d90d4556bbb05ae2e4005bd5dc412a515dbd0df4f585ea257632135672e0a3961b2f59db041904e221683e0ee6788e9ac57cf27b243b9533a335a0a07a88b
+  metadata.gz: 39cdb61a3f6be45f76d7676eed2addaa6b6d4d24cbc7c8a455a684709deb43d82a2bfbd22397ecb28c7f8ba6b91cb6fc24d692cf50ad5c41b8005a649a06a259
+  data.tar.gz: dd45b03f8fee1a7acdd8809485f7ed75b9c2ed7c43d28394a38bc19ca5d8c1bdcdf852c692e80d0f7eb5b45aacd7d0ef95380d209034b663b3f99ebc7e368f9a

data/lib/validation_matcher/version.rb

@@ -1,3 +1,3 @@
 module ValidationMatcher
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/lib/validation_matcher.rb

@@ -3,6 +3,23 @@ require 'rspec/expectations'
 
 module ValidationMatcher
 
+  class UnexpectedOptions < RuntimeError
+
+    attr_reader :validator
+
+    def initialze validator
+      @validator = validator
+    end
+
+    def message
+      <<-MSG
+        Cannot validate options with custom validator.
+        Use `should validate #{ validator.inspect }` (with no options) instead."
+      MSG
+    end
+
+  end
+
   RSpec::Matchers.define :validate do |*expected|
     attr_reader :expected_attribute, :expected_options, :expected_validator
 
@@ -13,7 +30,17 @@ module ValidationMatcher
       @expected_options ||= {}
       @expected_validator = expected.first
 
-      validator?
+      validator? or callback?
+    end
+
+    def callback_methods
+      actual._validate_callbacks.select { |c| c.filter == expected_validator }
+    end
+
+    def callback?
+      callback = callback_methods.any?
+      fail UnexpectedOptions if callback and expected_options.any?
+      callback
     end
 
     def attribute_validators
@@ -25,7 +52,6 @@ module ValidationMatcher
         validator.kind == expected_validator && validator.options == expected_options
       end
     end
-
   end
 
 end

data/spec/spec_helper.rb

@@ -37,4 +37,12 @@ class Thing
   validates :field_b, presence: true
   validates :field_c, numericality: { allow_nil: false, only_integer: true }
 
+  validate :custom_validator
+
+private
+
+  def custom_validator
+    errors[:base] << 'Field A should be false-y' if field_a
+  end
+
 end

data/spec/thing_spec.rb

@@ -2,11 +2,43 @@ require 'spec_helper'
 
 describe Thing do
 
-  it { should_not validate(:presence).of :field_a }
-  it { should     validate(:presence).of :field_b }
+  describe 'each validators' do
 
-  it { should_not validate(:numericality).of :field_c }
-  it { should_not validate(:numericality).of(:field_c).with only_integer: true }
-  it { should     validate(:numericality).of(:field_c).with only_integer: true, allow_nil: false }
+    describe 'without options' do
+
+      it { should_not validate(:presence).of :field_a }
+      it { should     validate(:presence).of :field_b }
+
+      it { should_not validate(:numericality).of :field_c }
+
+    end
+
+    describe 'with options' do
+
+      it { should_not validate(:numericality).of(:field_c).with only_integer: true }
+
+      it { should validate(:numericality).of(:field_c).with only_integer: true, allow_nil: false }
+
+    end
+
+  end
+
+  describe 'custom validations' do
+
+    describe 'without options' do
+
+      it { should validate :custom_validator }
+
+    end
+
+    describe 'with options' do
+
+      it 'is not supported ' do
+        -> { should validate(:custom_validator).with on: :update }.should raise_exception ValidationMatcher::UnexpectedOptions
+      end
+
+    end
+
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validation_matcher
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - BM5k