shoulda-matchers 1.4.1 → 1.4.2

data/spec/shoulda/active_model/validate_numericality_of_matcher_spec.rb

@@ -1,8 +1,12 @@
 require 'spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher do
+  it "should state in its description that it allows only numeric values" do
+    matcher = Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher.new(:attr)
+    matcher.description.should == "only allow numeric values for attr"
+  end
 
-  context "a numeric attribute" do
+  context "given a numeric attribute" do
     before do
       define_model :example, :attr => :string do
         validates_numericality_of :attr
@@ -11,28 +15,60 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher do
     end
 
     it "should only allow numeric values for that attribute" do
-      @model.should validate_numericality_of(:attr)
+      matcher = new_matcher(:attr)
+      matcher.matches?(@model).should be_true
     end
 
     it "should not override the default message with a blank" do
-      @model.should validate_numericality_of(:attr).with_message(nil)
+      matcher = new_matcher(:attr)
+      matcher.with_message(nil)
+      matcher.matches?(@model).should be_true
+    end
+
+    context "when asked to enforce integer values for that attribute" do
+      it "should not match" do
+        matcher = new_matcher(:attr)
+        matcher.only_integer
+        matcher.matches?(@model).should be_false
+      end
+
+      it "should fail with the ActiveRecord :not_an_integer message" do
+        matcher = new_matcher(:attr)
+        matcher.only_integer
+        matcher.matches?(@model)
+        matcher.failure_message.should include 'Expected errors to include "must be an integer"'
+      end
     end
   end
 
-  context "a numeric attribute which must be integer" do
+  context "given a numeric attribute which must be integer" do
     before do
       define_model :example, :attr => :string do
-          validates_numericality_of :attr, { :only_integer => true }
+        validates_numericality_of :attr, { :only_integer => true }
       end
       @model = Example.new
     end
 
-    it "should only allow integer values for that attribute" do
-      @model.should validate_numericality_of(:attr).only_integer
+    it "allows integer values for that attribute" do
+      matcher = new_matcher(:attr)
+      matcher.only_integer
+      matcher.matches?(@model).should be_true
+    end
+
+    it "does not allow non-integer values for that attribute" do
+      matcher = new_matcher(:attr)
+      matcher.only_integer
+      matcher.matches?(@model).should be_true
+    end
+
+    it "should state in its description that it allows only integer values" do
+      matcher = new_matcher(:attr)
+      matcher.only_integer
+      matcher.description.should == "only allow numeric, integer values for attr"
     end
   end
 
-  context "a numeric attribute with a custom validation message" do
+  context "given a numeric attribute with a custom validation message" do
     before do
       define_model :example, :attr => :string do
         validates_numericality_of :attr, :message => 'custom'
@@ -41,22 +77,36 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher do
     end
 
     it "should only allow numeric values for that attribute with that message" do
-      @model.should validate_numericality_of(:attr).with_message(/custom/)
+      matcher = new_matcher(:attr)
+      matcher.with_message(/custom/)
+      matcher.matches?(@model).should be_true
     end
 
     it "should not allow numeric values for that attribute with another message" do
-      @model.should_not validate_numericality_of(:attr)
+      matcher = new_matcher(:attr)
+      matcher.with_message(/wrong/)
+      matcher.matches?(@model).should be_false
     end
   end
 
-  context "a non-numeric attribute" do
+  context "given a non-numeric attribute" do
     before do
       @model = define_model(:example, :attr => :string).new
     end
 
     it "should not only allow numeric values for that attribute" do
-      @model.should_not validate_numericality_of(:attr)
+      matcher = new_matcher(:attr)
+      matcher.matches?(@model).should be_false
+    end
+
+    it "should fail with the ActiveRecord :not_a_number message" do
+      matcher = new_matcher(:attr)
+      matcher.matches?(@model)
+      matcher.failure_message.should include 'Expected errors to include "is not a number"'
     end
   end
 
+  def new_matcher(attr)
+    Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher.new(attr)
+  end
 end

data/spec/shoulda/independent/delegate_matcher_spec.rb

@@ -0,0 +1,183 @@
+require 'spec_helper'
+
+describe Shoulda::Matchers::Independent::DelegateMatcher do
+  it 'supports chaining on #to' do
+    matcher = delegate_method(:method)
+    matcher.to(:another_method).should == matcher
+  end
+
+  it 'supports chaining on #with_arguments' do
+    matcher = delegate_method(:method)
+    matcher.with_arguments(1, 2, 3).should == matcher
+  end
+
+  it 'supports chaining on #as' do
+    matcher = delegate_method(:method)
+    matcher.as(:some_other_method).should == matcher
+  end
+
+  it 'should raise an error if no delegation target is defined' do
+    object = Object.new
+    expect {
+      object.should delegate_method(:name)
+    }.to raise_exception Shoulda::Matchers::Independent::DelegateMatcher::TargetNotDefinedError
+  end
+
+  it 'should raise an error if called with #should_not' do
+    object = Object.new
+    expect {
+      object.should_not delegate_method(:name).to(:anyone)
+    }.to raise_exception Shoulda::Matchers::Independent::DelegateMatcher::InvalidDelegateMatcher
+  end
+
+  context 'given a method that does not delegate' do
+    before do
+      define_class(:post_office) do
+        def deliver_mail
+          :delivered
+        end
+      end
+    end
+
+    it 'does not match' do
+      post_office = PostOffice.new
+      matcher = delegate_method(:deliver_mail).to(:mailman)
+      matcher.matches?(post_office).should be_false
+    end
+
+    it 'has a failure message that indicates which method should have been delegated' do
+      post_office = PostOffice.new
+      matcher = delegate_method(:deliver_mail).to(:mailman)
+
+      matcher.matches?(post_office)
+
+      message = 'Expected PostOffice#deliver_mail to delegate to PostOffice#mailman'
+      matcher.failure_message.should == message
+    end
+
+    it 'uses the proper syntax for class methods in errors' do
+      matcher = delegate_method(:deliver_mail).to(:mailman)
+
+      matcher.matches?(PostOffice)
+
+      message = 'Expected PostOffice.deliver_mail to delegate to PostOffice.mailman'
+      matcher.failure_message.should == message
+    end
+  end
+
+  context 'given a method that delegates properly' do
+    before do
+      define_class(:mailman)
+      define_class(:post_office) do
+        def deliver_mail
+          mailman.deliver_mail
+        end
+
+        def mailman
+          Mailman.new
+        end
+      end
+    end
+
+    it 'matches' do
+      post_office = PostOffice.new
+      post_office.should delegate_method(:deliver_mail).to(:mailman)
+    end
+  end
+
+  context 'given a method that delegates properly with certain arguments' do
+    before do
+      define_class(:mailman)
+      define_class(:post_office) do
+        def deliver_mail
+          mailman.deliver_mail('221B Baker St.', :hastily => true)
+        end
+
+        def mailman
+          Mailman.new
+        end
+      end
+    end
+
+    context 'when given the correct arguments' do
+      it 'matches' do
+        post_office = PostOffice.new
+        matcher = delegate_method(:deliver_mail).to(:mailman).with_arguments('221B Baker St.', :hastily => true)
+        post_office.should matcher
+      end
+    end
+
+    context 'when not given the correct arguments' do
+      it 'does not match' do
+        post_office = PostOffice.new
+        matcher = delegate_method(:deliver_mail).to(:mailman).with_arguments('123 Nowhere Ln.')
+        matcher.matches?(post_office).should be_false
+      end
+
+      it 'has a failure message that indicates which arguments were expected' do
+        post_office = PostOffice.new
+        matcher = delegate_method(:deliver_mail).to(:mailman).with_arguments('123 Nowhere Ln.')
+
+        matcher.matches?(post_office)
+
+        message = 'Expected PostOffice#deliver_mail to delegate to PostOffice#mailman with arguments: ["123 Nowhere Ln."]'
+        matcher.failure_message.should == message
+      end
+    end
+  end
+
+  context 'given a method that delegates properly to a method of a different name' do
+    before do
+      define_class(:mailman)
+      define_class(:post_office) do
+        def deliver_mail
+          mailman.deliver_mail_and_avoid_dogs
+        end
+
+        def mailman
+          Mailman.new
+        end
+      end
+    end
+
+    context 'when given the correct method name' do
+      it 'matches' do
+        post_office = PostOffice.new
+        matcher = delegate_method(:deliver_mail).to(:mailman).as(:deliver_mail_and_avoid_dogs)
+        post_office.should matcher
+      end
+    end
+
+    context 'when given an incorrect method name' do
+      it 'does not match' do
+        post_office = PostOffice.new
+        matcher = delegate_method(:deliver_mail).to(:mailman).as(:watch_tv)
+        matcher.matches?(post_office).should be_false
+      end
+
+      it 'has a failure message that indicates which method was expected' do
+        post_office = PostOffice.new
+        matcher = delegate_method(:deliver_mail).to(:mailman).as(:watch_tv)
+
+        matcher.matches?(post_office)
+
+        message = 'Expected PostOffice#deliver_mail to delegate to PostOffice#mailman as :watch_tv'
+        matcher.failure_message.should == message
+      end
+    end
+  end
+end
+
+describe Shoulda::Matchers::Independent::DelegateMatcher::TargetNotDefinedError do
+  it 'has a useful message' do
+    error = Shoulda::Matchers::Independent::DelegateMatcher::TargetNotDefinedError.new
+    error.message.should include 'Delegation needs a target'
+  end
+end
+
+describe Shoulda::Matchers::Independent::DelegateMatcher::InvalidDelegateMatcher do
+  it 'has a useful message' do
+    error = Shoulda::Matchers::Independent::DelegateMatcher::InvalidDelegateMatcher.new
+    error.message.should include 'does not support #should_not'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -33,53 +33,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: bourne
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
+        version: 1.1.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: bourne
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -203,12 +203,14 @@ files:
 - lib/shoulda/matchers/active_model.rb
 - lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher.rb
+- lib/shoulda/matchers/active_model/disallow_value_matcher.rb
 - lib/shoulda/matchers/active_model/ensure_exclusion_of_matcher.rb
 - lib/shoulda/matchers/active_model/ensure_inclusion_of_matcher.rb
 - lib/shoulda/matchers/active_model/ensure_length_of_matcher.rb
 - lib/shoulda/matchers/active_model/errors.rb
 - lib/shoulda/matchers/active_model/exception_message_finder.rb
 - lib/shoulda/matchers/active_model/helpers.rb
+- lib/shoulda/matchers/active_model/only_integer_matcher.rb
 - lib/shoulda/matchers/active_model/validate_acceptance_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_confirmation_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_format_of_matcher.rb
@@ -226,6 +228,8 @@ files:
 - lib/shoulda/matchers/active_record/query_the_database_matcher.rb
 - lib/shoulda/matchers/active_record/serialize_matcher.rb
 - lib/shoulda/matchers/assertion_error.rb
+- lib/shoulda/matchers/independent.rb
+- lib/shoulda/matchers/independent/delegate_matcher.rb
 - lib/shoulda/matchers/integrations/rspec.rb
 - lib/shoulda/matchers/integrations/test_unit.rb
 - lib/shoulda/matchers/version.rb
@@ -250,11 +254,13 @@ files:
 - spec/shoulda/action_mailer/have_sent_email_spec.rb
 - spec/shoulda/active_model/allow_mass_assignment_of_matcher_spec.rb
 - spec/shoulda/active_model/allow_value_matcher_spec.rb
+- spec/shoulda/active_model/disallow_value_matcher_spec.rb
 - spec/shoulda/active_model/ensure_exclusion_of_matcher_spec.rb
 - spec/shoulda/active_model/ensure_inclusion_of_matcher_spec.rb
 - spec/shoulda/active_model/ensure_length_of_matcher_spec.rb
 - spec/shoulda/active_model/exception_message_finder_spec.rb
 - spec/shoulda/active_model/helpers_spec.rb
+- spec/shoulda/active_model/only_integer_matcher_spec.rb
 - spec/shoulda/active_model/validate_acceptance_of_matcher_spec.rb
 - spec/shoulda/active_model/validate_confirmation_of_matcher_spec.rb
 - spec/shoulda/active_model/validate_format_of_matcher_spec.rb
@@ -269,6 +275,7 @@ files:
 - spec/shoulda/active_record/have_readonly_attributes_matcher_spec.rb
 - spec/shoulda/active_record/query_the_database_matcher_spec.rb
 - spec/shoulda/active_record/serialize_matcher_spec.rb
+- spec/shoulda/independent/delegate_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_versions.rb
 - spec/support/class_builder.rb
@@ -289,7 +296,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2974632708122422691
+      hash: 3885961739329133579
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -298,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2974632708122422691
+      hash: 3885961739329133579
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -329,11 +336,13 @@ test_files:
 - spec/shoulda/action_mailer/have_sent_email_spec.rb
 - spec/shoulda/active_model/allow_mass_assignment_of_matcher_spec.rb
 - spec/shoulda/active_model/allow_value_matcher_spec.rb
+- spec/shoulda/active_model/disallow_value_matcher_spec.rb
 - spec/shoulda/active_model/ensure_exclusion_of_matcher_spec.rb
 - spec/shoulda/active_model/ensure_inclusion_of_matcher_spec.rb
 - spec/shoulda/active_model/ensure_length_of_matcher_spec.rb
 - spec/shoulda/active_model/exception_message_finder_spec.rb
 - spec/shoulda/active_model/helpers_spec.rb
+- spec/shoulda/active_model/only_integer_matcher_spec.rb
 - spec/shoulda/active_model/validate_acceptance_of_matcher_spec.rb
 - spec/shoulda/active_model/validate_confirmation_of_matcher_spec.rb
 - spec/shoulda/active_model/validate_format_of_matcher_spec.rb
@@ -348,6 +357,7 @@ test_files:
 - spec/shoulda/active_record/have_readonly_attributes_matcher_spec.rb
 - spec/shoulda/active_record/query_the_database_matcher_spec.rb
 - spec/shoulda/active_record/serialize_matcher_spec.rb
+- spec/shoulda/independent/delegate_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_versions.rb
 - spec/support/class_builder.rb