warp 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f12aad08ee52c87c70887a3be0718247b7dc78d7
-  data.tar.gz: 3179971a7cd9251f48252413a27c15298c74d4ff
+  metadata.gz: 5c7c3c6f9e427418e76e0be7e7a5f14fe6cc669b
+  data.tar.gz: 1ce6c0bf3dec5650c89f3016f27bd3735840808b
 SHA512:
-  metadata.gz: d9b2432dca61f39830d3514b83d99337b6397fda5942f333d06fe78bf296d8b483b32f155a2ec9937a80b3e5eeab4012cba89286cde5122c8f68e1369b5124f8
-  data.tar.gz: 6f45e4c01f15a0fc44a2e382ea67b5ce802a7d13d353ac7e7aaa26e35ee7bf290437794c839499454fd4dde6437e6066db2d5edddd77d77a82913556105bb7b8
+  metadata.gz: f53d6173f69d9da373f3632bb406a002ff55417ef7f1adba46eb01e5c6ff2576f6eb9d7101d2a9388ec2c2652d65166b09c2d2d2cf2941c659e17ce1a04ecc31
+  data.tar.gz: 6a9eaf01f40faf8866608e8f03c1b0579702f8f92f18fbe3d1e5d82caeac436b57aaa1a325a9e89cbc3284000fe738dce3d2e72a87138afec123ed8a21e8bc25

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+- 1.2.0
+  - Updated model descriptions and failure messages.
+
+- 1.1.0
+  - Added model association matchers.
+  - Added model attribute matchers.
+
 - 1.0.1
   - Fixed issue where matchers would error unless explicitly passed the controller object.
 

data/Gemfile

@@ -2,8 +2,12 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
 
+gem "rake"
+gem "fuubar"
+
 gem "simplecov", require: false
 gem "coveralls", require: false
 

data/README.md

@@ -21,7 +21,7 @@ And then execute:
 
 ## Usage
 
-### Controller Matchers
+### Assign Matchers
 
 #### assigns(key)
 
@@ -55,6 +55,8 @@ Ensures that the specific assign is set with a instance of the specified class t
 specify { expect(controller).to assign(:post).with_a_new(Post) }
 ```
 
+### Flash Matchers
+
 #### set_flash(key)
 
 Ensure that the specific flash key is set:
@@ -70,7 +72,7 @@ Ensure that the specific flash key is set:
 specify { expect(controller).to set_flash(:notice).to("Your order has been processed.") }
 ```
 
-### Model Matchers
+### Association Matchers
 
 #### belongs_to(association)
 
@@ -108,6 +110,8 @@ specify { expect(group).to have_and_belong_to_many(:users) }
 
 This matcher is not avaliable on Rails 4.1+, as these versions of Rails will create a `has_many :though` association instead of a 'has_and_belongs_to_many' association.
 
+### Attribute Matchers
+
 #### have_attribute(attribute)
 
 Checks if a certain attribute is present on a model. Works against models or model instances.
@@ -116,6 +120,99 @@ Checks if a certain attribute is present on a model. Works against models or mod
 specify { expect(user).to have_attribute(:name) }
 ```
 
+### Validation Matchers
+
+All validation matchers can be specified with, or without options to verify.
+
+#### validate_acceptance_of
+
+Ensures that a `validates_acceptance_of` validator is present on the attribute.
+
+```ruby
+specify { expect(user).to validate_acceptance_of(:terms) }
+```
+
+#### validate_absence_of
+
+Ensures that a `validates_absence_of` validator is present on the attribute.
+Only avaliable on Rails 4+.
+
+```ruby
+specify { expect(user).to validate_absence_of(:postcode, if: :non_us_address) }
+```
+
+#### validate_confirmation_of
+
+Ensures that a `validates_confirmation_of` validator is present on the attribute.
+
+```ruby
+specify { expect(user).to validate_confirmation_of(:password) }
+```
+
+#### validate_exclusion_of
+
+Ensures that a `validates_exclusion_of` validator is present on the attribute.
+
+```ruby
+specify { expect(user).to validate_exclusion_of(:age, in: 0..17) }
+```
+
+#### validate_format_of
+
+Ensures that a `validates_format_of` validator is present on the attribute.
+
+```ruby
+specify { expect(user).to validate_format_of(:postcode, with: /\d{5,8}/) }
+```
+
+#### validate_inclusion_of
+
+Ensures that a `validates_inclusion_of` validator is present on the attribute.
+
+```ruby
+specify { expect(user).to validate_inclusion_of(:role, in: ["develop", "design"]) }
+```
+
+#### validate_length_of
+
+Ensures that a `validates_length_of` validator is present on the attribute.
+
+```ruby
+specify { expect(user).to validate_length_of(:name, in: 5..25) }
+```
+
+#### validate_numericality_of
+
+Ensures that a `validates_numericality_of` validator is present on the attribute.
+
+```ruby
+specify { expect(user).to validate_numericality_of(:age) }
+```
+
+#### validate_presence_of
+
+Ensures that a `validates_presence_of` validator is present on the attribute.
+
+```ruby
+specify { expect(user).to validate_presence_of(:name) }
+```
+
+#### validate_association_of
+
+Ensures that a `validates_association_of` validator is present on the attribute.
+
+```ruby
+specify { expect(user).to validate_association_of(:profile) }
+```
+
+#### validate_uniqueness_of
+
+Ensures that a `validates_uniqueness_of` validator is present on the attribute.
+
+```ruby
+specify { expect(user).to validate_uniqueness_of(:email, scope: :company) }
+```
+
 ## Contributing
 
 1. Fork it

data/gemfiles/rails_3.2_rspec_2.14.gemfile

@@ -2,7 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
+gem "rake"
+gem "fuubar"
 gem "simplecov", :require=>false
 gem "coveralls", :require=>false
 gem "activesupport", "~> 3.2", :require=>"active_support/all"

data/gemfiles/rails_3.2_rspec_2.99.0.beta1.gemfile

@@ -2,7 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
+gem "rake"
+gem "fuubar"
 gem "simplecov", :require=>false
 gem "coveralls", :require=>false
 gem "activesupport", "~> 3.2", :require=>"active_support/all"

data/gemfiles/rails_3.2_rspec_3.0.0.beta1.gemfile

@@ -2,7 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
+gem "rake"
+gem "fuubar"
 gem "simplecov", :require=>false
 gem "coveralls", :require=>false
 gem "activesupport", "~> 3.2", :require=>"active_support/all"

data/gemfiles/rails_3.2_rspec_master.gemfile

@@ -2,7 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
+gem "rake"
+gem "fuubar"
 gem "simplecov", :require=>false
 gem "coveralls", :require=>false
 gem "activesupport", "~> 3.2", :require=>"active_support/all"

data/gemfiles/rails_4.0_rspec_2.14.gemfile

@@ -2,7 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
+gem "rake"
+gem "fuubar"
 gem "simplecov", :require=>false
 gem "coveralls", :require=>false
 gem "activesupport", "~> 4.0", :require=>"active_support/all"

data/gemfiles/rails_4.0_rspec_2.99.0.beta1.gemfile

@@ -2,7 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
+gem "rake"
+gem "fuubar"
 gem "simplecov", :require=>false
 gem "coveralls", :require=>false
 gem "activesupport", "~> 4.0", :require=>"active_support/all"

data/gemfiles/rails_4.0_rspec_3.0.0.beta1.gemfile

@@ -2,7 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
+gem "rake"
+gem "fuubar"
 gem "simplecov", :require=>false
 gem "coveralls", :require=>false
 gem "activesupport", "~> 4.0", :require=>"active_support/all"

data/gemfiles/rails_4.0_rspec_master.gemfile

@@ -2,7 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
+gem "rake"
+gem "fuubar"
 gem "simplecov", :require=>false
 gem "coveralls", :require=>false
 gem "activesupport", "~> 4.0", :require=>"active_support/all"

data/gemfiles/rails_4.1.0.beta1_rspec_2.14.gemfile

@@ -2,7 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
+gem "rake"
+gem "fuubar"
 gem "simplecov", :require=>false
 gem "coveralls", :require=>false
 gem "activesupport", "4.1.0.beta1", :require=>"active_support/all"

data/gemfiles/rails_4.1.0.beta1_rspec_2.99.0.beta1.gemfile

@@ -2,7 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
+gem "rake"
+gem "fuubar"
 gem "simplecov", :require=>false
 gem "coveralls", :require=>false
 gem "activesupport", "4.1.0.beta1", :require=>"active_support/all"

data/gemfiles/rails_4.1.0.beta1_rspec_3.0.0.beta1.gemfile

@@ -2,7 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
+gem "rake"
+gem "fuubar"
 gem "simplecov", :require=>false
 gem "coveralls", :require=>false
 gem "activesupport", "4.1.0.beta1", :require=>"active_support/all"

data/gemfiles/rails_4.1.0.beta1_rspec_master.gemfile

@@ -2,7 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "~> 1.5.1"
 gem "appraisal", "1.0.0.beta2"
+gem "rake"
+gem "fuubar"
 gem "simplecov", :require=>false
 gem "coveralls", :require=>false
 gem "activesupport", "4.1.0.beta1", :require=>"active_support/all"

data/lib/warp/controller_matchers.rb

@@ -1,3 +1,7 @@
+unless defined?(ActionController)
+  raise RuntimeError, "ActionController is required to use Warp::ControllerMatchers."
+end
+
 require "warp/controller_matchers/assign_matcher"
 require "warp/controller_matchers/set_flash_matcher"
 

data/lib/warp/matcher.rb

@@ -17,7 +17,7 @@ module Warp
     # RSpec 2 and 3 have different methods
     # that they call on matcher to get the
     # failure messages.
-    if RSpec::Version::STRING[0] == "2"
+    if RSpec::Version::STRING[0] == "2" || RSpec::Version::STRING == "3.0.0.beta1"
       def failure_message_for_should
         failure_message
       end

data/lib/warp/model_matchers/association_matcher.rb

@@ -1,35 +1,43 @@
 module Warp
   module ModelMatchers
     class AssociationMatcher < Warp::ModelMatchers::Matcher
-      attr_reader :macro, :key
-      attr_reader :failure_message, :failure_message_when_negated, :description
-
-      def initialize(macro, key)
-        @macro = macro
+      attr_reader :expected_macro, :key
+      
+      def initialize(expected_macro, key)
+        @expected_macro = expected_macro
         @key = key
       end
 
       def matches?(model_or_instance)
-        if association = model(model_or_instance).reflect_on_association(key)
-          actual_macro = association.macro
-          @failure_message = "expected to have association #{macro} :#{key}, but had #{actual_macro} :#{key}"
-          @failure_message_when_negated = "expected to not have association #{macro} :#{key}"
-          actual_macro == macro
+        @model_or_instance = model_or_instance
+
+        association && values_match?(expected_macro, assocation_macro)
+      end
+
+      def description
+        "have a #{expected_macro} association with :#{key}"
+      end
+
+      def failure_message
+        if association
+          "expected #{model_name} to #{description}, but had a #{assocation_macro} association with :#{key}"
         else
-          @failure_message = "expected to have association #{macro} :#{key}"
-          @failure_message_when_negated = "expected to not have association #{macro} :#{key}"
-          false
+          "expected #{model_name} to #{description}"
         end
       end
 
+      def failure_message_when_negated
+        "expected #{model_name} to not #{description}"
+      end
+
       private
 
-      def model(model_or_instance)
-        if model_or_instance.is_a? Class
-          model_or_instance
-        else
-          model_or_instance.class
-        end
+      def association
+        model.reflect_on_association(key)
+      end
+
+      def assocation_macro
+        association.macro
       end
     end
 

data/lib/warp/model_matchers/attribute_matcher.rb

@@ -1,27 +1,34 @@
-module Warp
+  module Warp
   module ModelMatchers
     class AttributeMatcher < Warp::ModelMatchers::Matcher
       attr_reader :attr_name
-      attr_reader :failure_message, :failure_message_when_negated, :description
 
       def initialize(attr_name)
         @attr_name = attr_name.to_sym
       end
 
       def matches?(model_or_instance)
-        if attributes(model_or_instance).any? {|actual| values_match?(attr_name, actual) }
-          @failure_message = "expected to have attribute #{description_of(attr_name)}"
-          @failure_message_when_negated = "expected to not have attribute #{description_of(attr_name)}"
-          true
-        else
-          @failure_message = "expected to have attribute #{description_of(attr_name)}"
-          @failure_message_when_negated = "expected to not have attribute #{description_of(attr_name)}"
-          false
-        end
+        @model_or_instance = model_or_instance
+
+        attributes.any? {|actual| values_match?(attr_name, actual) }
+      end
+
+      def description
+        "have attribute #{description_of(attr_name)}"
+      end
+
+      def failure_message
+        "expected #{model_name} to #{description}"
+      end
+
+      def failure_message_when_negated
+        "expected #{model_name} to not #{description}"
       end
+      
+      private
 
-      def attributes(model_or_instance)
-        model(model_or_instance).column_names.map(&:to_sym)
+      def attributes
+        model.column_names.map(&:to_sym)
       end
     end
 

data/lib/warp/model_matchers/matcher.rb

@@ -1,15 +1,21 @@
 module Warp
   module ModelMatchers
     class Matcher < Warp::Matcher
+      attr_reader :model_or_instance
+
       private
 
-      def model(model_or_instance)
+      def model
         if model_or_instance.is_a? Class
           model_or_instance
         else
           model_or_instance.class
         end
       end
+
+      def model_name
+        model.name
+      end
     end
   end
 end

data/lib/warp/model_matchers/validation_matcher.rb

@@ -1,12 +1,98 @@
 module Warp
   module ModelMatchers
-    class ValidationMatcher < Warp::Matcher
+    class ValidationMatcher < Warp::ModelMatchers::Matcher
+      VALIDATORS = [
+        ActiveModel::Validations::AcceptanceValidator,
+        ActiveModel::Validations::ConfirmationValidator,
+        ActiveModel::Validations::ExclusionValidator,
+        ActiveModel::Validations::FormatValidator,
+        ActiveModel::Validations::InclusionValidator,
+        ActiveModel::Validations::LengthValidator,
+        ActiveModel::Validations::NumericalityValidator,
+        ActiveModel::Validations::PresenceValidator
+      ]
 
+      # AbsenceValidator added in Rails 4
+      if defined?(ActiveModel::Validations::AbsenceValidator)
+        VALIDATORS << ActiveModel::Validations::AbsenceValidator
+      end
 
+      if defined?(ActiveRecord)
+        VALIDATORS.concat [
+          ActiveRecord::Validations::AssociatedValidator,
+          ActiveRecord::Validations::UniquenessValidator
+        ]
+      end
+
+      # In Rails 4 PresenceValidator is subclassed by AR
+      if defined?(ActiveRecord::Validations::PresenceValidator)
+        VALIDATORS.delete(ActiveModel::Validations::PresenceValidator)
+        VALIDATORS.push(ActiveRecord::Validations::PresenceValidator)
+      end
+
+      VALIDATORS.freeze
+
+      attr_reader :attr_name, :validator_class, :validator_options, :display_options
+
+      def initialize(attr_name, validator_class, validator_options, display_options)
+        @attr_name = attr_name
+        @validator_class = validator_class
+        @validator_options = validator_options
+        @display_options = display_options
+      end
+
+      def matches?(model_or_instance)
+        @model_or_instance = model_or_instance
+
+        validators.any? do |validator|
+          if values_match?(validator_class, validator.class)
+            validator_options.nil? || values_match?(validator_options, validator.options)
+          else
+            false
+          end
+        end
+      end
+
+      def failure_message
+        "expected #{model_name} to #{description}"
+      end
+
+      def failure_message_when_negated
+        "expected #{model_name} to not #{description}"
+      end
+
+      def description
+        str = "have validator #{validator_class.name} on :#{attr_name}"
+        str << " with options #{description_of(display_options)}" if display_options.present?
+        str
+      end
+
+      private
+
+      def validators
+        model._validators[attr_name]
+      end
     end
 
-    def validate
+    ValidationMatcher::VALIDATORS.each do |validator|
+      validator_name = validator.name.match(/::(?<name>\w+)Validator/)[:name].underscore.to_sym
+      method_name = (validator_name == :associated) ? "validate_associated" : "validate_#{validator_name}_of"
+
+      define_method method_name do |attr_name, *options|
+        display_options = options.first
+        options = display_options.try(:dup) || {}
+
+        case validator_name 
+        when :uniqueness
+          options = {case_sensitive: true}.merge(options)
+        when :acceptance
+          options = {allow_nil: true, accept: "1"}.merge(options)
+        end
+
+        options = nil if options.empty?
 
+        ValidationMatcher.new(attr_name, validator, options, display_options)
+      end
     end
   end
 end

data/lib/warp/model_matchers.rb

@@ -1,9 +1,16 @@
+unless defined?(ActiveModel)
+  raise RuntimeError, "ActiveModel is required to use Warp::ModelMatchers."
+end
+
 require "warp/model_matchers/matcher"
 
-require "warp/model_matchers/association_matcher"
-require "warp/model_matchers/attribute_matcher"
 # require "warp/model_matchers/error_matcher"
-# require "warp/model_matchers/validation_matcher"
+require "warp/model_matchers/validation_matcher"
+
+if defined?(ActiveRecord)
+  require "warp/model_matchers/association_matcher"
+  require "warp/model_matchers/attribute_matcher"
+end
 
 RSpec.configure do |config|
   config.include Warp::ModelMatchers

data/lib/warp/version.rb

@@ -1,7 +1,7 @@
 module Warp
   module VERSION
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
 
     BETA = nil

data/spec/spec_helper.rb

@@ -1,5 +1,13 @@
 require "bundler"
 
+unless ENV["TRAVIS_CI"]
+  if RUBY_VERSION[0] == "2"
+    require "byebug"
+  else
+    require "debugger"
+  end
+end
+
 require "simplecov"
 
 if ENV["TRAVIS_CI"]

data/spec/support/match_helpers.rb

@@ -1,5 +1,5 @@
 module MatchHelpers
-  class MatchMatcher
+  class MatchMatcher < Warp::Matcher
     attr_reader :value, :matcher
 
     def initialize(value)

data/spec/support/model_helpers.rb

@@ -14,6 +14,11 @@ module ModelHelpers
           @columns ||= []
         end
 
+        def self.attribute_method?(method)
+          method = method.to_s.sub("=", "")
+          columns.any? {|c| c.name == method }
+        end
+
         def self.column(name, sql_type = nil, default = nil, null = true)
           columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
         end

data/spec/support/with_contexts_helpers.rb

@@ -2,8 +2,6 @@ module WithContextsHelpers
   class WithContextsBuilder
     attr_accessor :contexts, :examples, :group
 
-    delegate :let, :before, :after, :subject, to: :group
-
     def initialize(group)
       @contexts = {}
       @group = group
@@ -21,6 +19,18 @@ module WithContextsHelpers
       self.examples = blk
     end
 
+    def let(*args, &blk)
+      group.let(*args, &blk)
+    end
+
+    def before(*args, &blk)
+      group.before(*args, &blk)
+    end
+
+    def after(*args, &blk)
+      group.after(*args, &blk)
+    end
+
     def execute
       contexts.each do |name, blk|
         context = group.context(name)

data/spec/warp/model_helpers/association_matcher_spec.rb

@@ -70,7 +70,7 @@ describe Warp::ModelMatchers::AssociationMatcher do
               specify { expect(subject).to match(model_or_instance) }
             
               describe_failure_message_when_negated do
-                specify { expect(subject).to eq "expected to not have association #{matcher_macro} :#{key}" }
+                specify { expect(subject).to eq "expected TestModel to not have a #{matcher_macro} association with :#{key}" }
               end
             end
 
@@ -81,7 +81,7 @@ describe Warp::ModelMatchers::AssociationMatcher do
               specify { expect(subject).to_not match(model_or_instance) }
             
               describe_failure_message do
-                specify { expect(subject).to eq "expected to have association #{matcher_macro} :#{key}, but had #{actual_macro} :#{key}" }
+                specify { expect(subject).to eq "expected TestModel to have a #{matcher_macro} association with :#{key}, but had a #{actual_macro} association with :#{key}" }
               end
             end
           end
@@ -92,7 +92,7 @@ describe Warp::ModelMatchers::AssociationMatcher do
             specify { expect(subject).to_not match(model_or_instance) }
           
             describe_failure_message do
-              specify { expect(subject).to eq "expected to have association #{matcher_macro} :#{key}" }
+              specify { expect(subject).to eq "expected TestModel to have a #{matcher_macro} association with :#{key}" }
             end
           end
         end

data/spec/warp/model_helpers/attribute_matcher_spec.rb

@@ -25,7 +25,7 @@ describe Warp::ModelMatchers::AttributeMatcher do
         specify { expect(subject).to match(model_or_instance) }
       
         describe_failure_message_when_negated do
-          specify { expect(subject).to eq "expected to not have attribute :#{attr_name}" }
+          specify { expect(subject).to eq "expected TestModel to not have attribute :#{attr_name}" }
         end
       end
 
@@ -35,7 +35,7 @@ describe Warp::ModelMatchers::AttributeMatcher do
         specify { expect(subject).to_not match(model_or_instance) }
       
         describe_failure_message do
-          specify { expect(subject).to eq "expected to have attribute :#{attr_name}" }
+          specify { expect(subject).to eq "expected TestModel to have attribute :#{attr_name}" }
         end
       end
     end

data/spec/warp/model_helpers/validation_matcher_spec.rb

@@ -0,0 +1,172 @@
+require "spec_helper"
+
+describe Warp::ModelMatchers::ValidationMatcher do
+  build_model do
+    column :foo
+  end
+
+  let(:attr_name) { :foo }
+
+  let(:matcher) { send(matcher_method, attr_name) }
+  let(:matcher_with_options) { send(matcher_method, attr_name, matcher_options) }
+
+  let(:validator_name) { matcher.validator_class.name }
+
+  with_contexts do
+    context "with model" do
+      let(:model_or_instance) { model }
+    end
+
+    context "with model instance" do
+      let(:model_or_instance) { model.new }
+    end
+
+    behaviour do
+      with_contexts do
+        # AbsenceValidator added in Rails 4
+        if defined?(ActiveModel::Validations::AbsenceValidator)
+          context "#validate_absence_of" do
+            let(:matcher_method) { :validate_absence_of }
+            let(:matcher_options) { {message: "must be blank"} }
+            let(:validation_method) { :validates_absence_of }
+            let(:validation_base_options) { {} }
+          end
+        end
+
+        context "#validate_acceptance_of" do
+          let(:matcher_method) { :validate_acceptance_of }
+          let(:matcher_options) { {if: :enabled?} }
+          let(:validation_method) { :validates_acceptance_of }
+          let(:validation_base_options) { {} }
+        end
+
+        context "#validate_confirmation_of" do
+          let(:matcher_method) { :validate_confirmation_of }
+          let(:matcher_options) { {unless: :tuesday?} }
+          let(:validation_method) { :validates_confirmation_of }
+          let(:validation_base_options) { {} }
+        end
+
+        context "#validate_exclusion_of" do
+          let(:matcher_method) { :validate_exclusion_of }
+          let(:matcher_options) { {in: 12..500} }
+          let(:validation_method) { :validates_exclusion_of }
+          let(:validation_base_options) { {in: [12, 500]} }
+        end
+
+        context "#validate_format_of" do
+          let(:matcher_method) { :validate_format_of }
+          let(:matcher_options) { {with: /foo[bar]*/} }
+          let(:validation_method) { :validates_format_of }
+          let(:validation_base_options) { {with: /qu+x/} }
+        end
+
+        context "#validate_inclusion_of" do
+          let(:matcher_method) { :validate_inclusion_of }
+          let(:matcher_options) { {in: ["foo", "bar", "baz", "qux"]} }
+          let(:validation_method) { :validates_inclusion_of }
+          let(:validation_base_options) { {in: 1..10} }
+        end
+
+        context "#validate_length_of" do
+          let(:matcher_method) { :validate_length_of }
+          let(:matcher_options) { {maximum: 32} }
+          let(:validation_method) { :validates_length_of }
+          let(:validation_base_options) { {is: 32} }
+        end
+
+        context "#validate_numericality_of" do
+          let(:matcher_method) { :validate_numericality_of }
+          let(:matcher_options) { {even: true} }
+          let(:validation_method) { :validates_numericality_of }
+          let(:validation_base_options) { {} }
+        end
+
+        context "#validate_presence_of" do
+          let(:matcher_method) { :validate_presence_of }
+          let(:matcher_options) { {unless: :not_required} }
+          let(:validation_method) { :validates_presence_of }
+          let(:validation_base_options) { {} }
+        end
+
+        context "#validate_association_of" do
+          let(:matcher_method) { :validate_associated }
+          let(:matcher_options) { {message: "it's neither here nor there"} }
+          let(:validation_method) { :validates_associated }
+          let(:validation_base_options) { {} }
+        end
+
+        context "#validate_uniqueness_of" do
+          let(:matcher_method) { :validate_uniqueness_of }
+          let(:matcher_options) { {scope: :post_id} }
+          let(:validation_method) { :validates_uniqueness_of }
+          let(:validation_base_options) { {} }
+        end
+
+        behaviour do
+          context "when matching without options" do
+            subject { matcher.tap {|m| m.matches?(model_or_instance) } }
+
+            context "with no matching validation" do
+              specify { expect(subject).to_not match(model_or_instance) }
+
+              describe_failure_message do
+                specify { expect(subject).to eq "expected TestModel to have validator #{validator_name} on :#{attr_name}" }
+              end
+            end
+
+            context "with a matching validation" do
+              before do
+                model.send(validation_method, attr_name, validation_base_options)
+              end
+
+              specify { expect(subject).to match(model_or_instance) }
+
+              describe_failure_message_when_negated do
+                specify { expect(subject).to eq "expected TestModel to not have validator #{validator_name} on :#{attr_name}" }
+              end
+            end
+          end
+
+          context "when matching with options" do
+            subject { matcher_with_options.tap {|m| m.matches?(model_or_instance) } }
+
+            context "with no matching validation" do
+              specify { expect(subject).to_not match(model_or_instance) }
+
+              describe_failure_message do
+                specify { expect(subject).to eq "expected TestModel to have validator #{validator_name} on :#{attr_name} with options #{matcher_options.inspect}" }
+              end
+            end
+
+            context "with a matching validation" do
+              context "with incorrect options" do
+                before do
+                  model.send(validation_method, attr_name, validation_base_options)
+                end
+
+                specify { expect(subject).to_not match(model_or_instance) }
+
+                describe_failure_message do
+                  specify { expect(subject).to eq "expected TestModel to have validator #{validator_name} on :#{attr_name} with options #{matcher_options.inspect}" }
+                end
+              end
+
+              context "with correct options" do
+                before do
+                  model.send(validation_method, attr_name, matcher_options)
+                end
+
+                specify { expect(subject).to match(model_or_instance) }
+
+                describe_failure_message_when_negated do
+                  specify { expect(subject).to eq "expected TestModel to not have validator #{validator_name} on :#{attr_name} with options #{matcher_options.inspect}" }
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/warp.gemspec

@@ -14,14 +14,8 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ["lib"]
 
-  # TODO: When RSpec 3 is released.
-  # spec.add_runtime_dependency "rspec", "~> 3.0.0"
-
-  spec.add_development_dependency "bundler", "~> 1.5.1"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "fuubar"
+  spec.add_runtime_dependency "rspec", ">= 2.14.0"
 end

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: warp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Thomas Drake-Brockman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fuubar
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.14.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 description: Rails matchers for your RSpec specs.
 email:
 - thom@sfedb.com
@@ -105,6 +77,7 @@ files:
 - spec/warp/controller_matchers/set_flash_matcher_spec.rb
 - spec/warp/model_helpers/association_matcher_spec.rb
 - spec/warp/model_helpers/attribute_matcher_spec.rb
+- spec/warp/model_helpers/validation_matcher_spec.rb
 - warp.gemspec
 homepage: ''
 licenses:
@@ -141,3 +114,4 @@ test_files:
 - spec/warp/controller_matchers/set_flash_matcher_spec.rb
 - spec/warp/model_helpers/association_matcher_spec.rb
 - spec/warp/model_helpers/attribute_matcher_spec.rb
+- spec/warp/model_helpers/validation_matcher_spec.rb