shoulda-matchers 1.4.2 → 1.5.0

data/lib/shoulda/matchers/active_model/validation_message_finder.rb

@@ -29,7 +29,7 @@ module Shoulda
 
         def messages_description
           if errors.empty?
-            "no errors"
+            'no errors'
           else
             "errors: #{pretty_error_messages(validated_instance)}"
           end

data/lib/shoulda/matchers/active_record/accept_nested_attributes_for_matcher.rb

@@ -50,11 +50,11 @@ module Shoulda
             update_only_correct?
         end
 
-        def failure_message
+        def failure_message_for_should
           "Expected #{expectation} (#{@problem})"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "Did not expect #{expectation}"
         end
 
@@ -78,7 +78,7 @@ module Shoulda
           if config
             true
           else
-            @problem = "is not declared"
+            @problem = 'is not declared'
             false
           end
         end
@@ -129,9 +129,9 @@ module Shoulda
 
         def should_or_should_not(value)
           if value
-            "should"
+            'should'
           else
-            "should not"
+            'should not'
           end
         end
       end

data/lib/shoulda/matchers/active_record/association_matcher.rb

@@ -124,11 +124,11 @@ module Shoulda # :nodoc:
             validate_correct?
         end
 
-        def failure_message
+        def failure_message_for_should
           "Expected #{expectation} (#{@missing})"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "Did not expect #{expectation}"
         end
 
@@ -260,7 +260,7 @@ module Shoulda # :nodoc:
           if !@validate && !reflection.options[:validate] || @validate == reflection.options[:validate]
             true
           else
-            @missing = "#{@name} should have #{@validate} as validate"
+            @missing = "#{@name} should have :validate => #{@validate}"
             false
           end
         end

data/lib/shoulda/matchers/active_record/have_db_column_matcher.rb

@@ -51,11 +51,11 @@ module Shoulda # :nodoc:
             correct_primary?
         end
 
-        def failure_message
+        def failure_message_for_should
           "Expected #{expectation} (#{@missing})"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "Did not expect #{expectation}"
         end
 
@@ -149,11 +149,11 @@ module Shoulda # :nodoc:
         def correct_scale?
           return true unless @options.key?(:scale)
 
-          if matched_column.scale.to_s == @options[:scale].to_s
+          if actual_scale.to_s == @options[:scale].to_s
             true
           else
-            @missing = "#{model_class} has a db column named #{@column} " <<
-                       "of scale #{matched_column.scale}, not #{@options[:scale]}."
+            @missing = "#{model_class} has a db column named #{@column} "
+            @missing << "of scale #{actual_scale}, not #{@options[:scale]}."
             false
           end
         end
@@ -166,9 +166,9 @@ module Shoulda # :nodoc:
           else
             @missing = "#{model_class} has a db column named #{@column} "
             if @options[:primary]
-              @missing << "that is not primary, but should be"
+              @missing << 'that is not primary, but should be'
             else
-              @missing << "that is primary, but should not be"
+              @missing << 'that is primary, but should not be'
             end
             false
           end
@@ -182,6 +182,10 @@ module Shoulda # :nodoc:
           @subject.class
         end
 
+        def actual_scale
+          matched_column.scale
+        end
+
         def expectation
           expected = "#{model_class.name} to #{description}"
         end

data/lib/shoulda/matchers/active_record/have_db_index_matcher.rb

@@ -37,11 +37,11 @@ module Shoulda # :nodoc:
           index_exists? && correct_unique?
         end
 
-        def failure_message
+        def failure_message_for_should
           "Expected #{expectation} (#{@missing})"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "Did not expect #{expectation}"
         end
 

data/lib/shoulda/matchers/active_record/have_readonly_attribute_matcher.rb

@@ -16,19 +16,19 @@ module Shoulda # :nodoc:
           @attribute = attribute.to_s
         end
 
-        attr_reader :failure_message, :negative_failure_message
+        attr_reader :failure_message_for_should, :failure_message_for_should_not
 
         def matches?(subject)
           @subject = subject
           if readonly_attributes.include?(@attribute)
-            @negative_failure_message = "Did not expect #{@attribute} to be read-only"
+            @failure_message_for_should_not = "Did not expect #{@attribute} to be read-only"
             true
           else
             if readonly_attributes.empty?
-              @failure_message = "#{class_name} attribute #{@attribute} " <<
-                "is not read-only"
+              @failure_message_for_should = "#{class_name} attribute #{@attribute} " <<
+                'is not read-only'
             else
-              @failure_message = "#{class_name} is making " <<
+              @failure_message_for_should = "#{class_name} is making " <<
                 "#{readonly_attributes.to_a.to_sentence} " <<
                 "read-only, but not #{@attribute}."
             end

data/lib/shoulda/matchers/active_record/query_the_database_matcher.rb

@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
+
 module Shoulda # :nodoc:
   module Matchers
     module ActiveRecord # :nodoc:
@@ -20,6 +22,7 @@ module Shoulda # :nodoc:
 
       class QueryTheDatabaseMatcher # :nodoc:
         def initialize(times)
+          ActiveSupport::Deprecation.warn 'The query_the_database matcher is deprecated and will be removed in 2.0'
           @queries = []
           @options = {}
 
@@ -67,7 +70,7 @@ module Shoulda # :nodoc:
           end
         end
 
-        def failure_message
+        def failure_message_for_should
           if @options.key?(:expected_query_count)
             "Expected ##{@options[:method_name]} to cause #{@options[:expected_query_count]} database queries but it actually caused #{@queries.length} queries:" + friendly_queries
           else
@@ -75,7 +78,7 @@ module Shoulda # :nodoc:
           end
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           if @options[:expected_query_count]
             "Expected ##{@options[:method_name]} to not cause #{@options[:expected_query_count]} database queries but it actually caused #{@queries.length} queries:" + friendly_queries
           else

data/lib/shoulda/matchers/active_record/serialize_matcher.rb

@@ -1,7 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
     module ActiveRecord # :nodoc:
-
       # Ensure that the field becomes serialized.
       #
       # Options:
@@ -10,6 +9,7 @@ module Shoulda # :nodoc:
       # Example:
       #   it { should serialize(:details) }
       #   it { should serialize(:details).as(Hash) }
+      #   it { should serialize(:details).as_instance_of(ExampleSerializer) }
       #
       def serialize(name)
         SerializeMatcher.new(name)
@@ -36,11 +36,11 @@ module Shoulda # :nodoc:
           serialization_valid? && type_valid?
         end
 
-        def failure_message
+        def failure_message_for_should
           "Expected #{expectation} (#{@missing})"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "Did not expect #{expectation}"
         end
 

data/lib/shoulda/matchers/assertion_error.rb

@@ -3,11 +3,14 @@ module Shoulda
     if Gem.ruby_version >= Gem::Version.new('1.8') && Gem.ruby_version < Gem::Version.new('1.9')
       require 'test/unit'
       AssertionError = Test::Unit::AssertionFailedError
+    elsif defined?(Test::Unit::AssertionFailedError)
+      # Test::Unit has been loaded already, so we use it
+      AssertionError = Test::Unit::AssertionFailedError
     elsif Gem.ruby_version >= Gem::Version.new("1.9")
       require 'minitest/unit'
       AssertionError = MiniTest::Assertion
     else
-      raise "No unit test library available"
+      raise 'No unit test library available'
     end
   end
 end

data/lib/shoulda/matchers/independent/delegate_matcher.rb

@@ -1,4 +1,5 @@
 require 'bourne'
+require 'active_support/deprecation'
 
 module Shoulda # :nodoc:
   module Matchers
@@ -10,12 +11,15 @@ module Shoulda # :nodoc:
       #   it { should delegate_method(:deliver_mail).to(:mailman) }
       #
       # Options:
-      # * <tt>:as</tt> - tests that the object being delegated to is called with a certain method (defaults to same name as delegating method)
-      # * <tt>:with_arguments</tt> - tests that the method on the object being delegated to is called with certain arguments
+      # * <tt>:as</tt> - tests that the object being delegated to is called with a certain method
+      #   (defaults to same name as delegating method)
+      # * <tt>:with_arguments</tt> - tests that the method on the object being delegated to is
+      #   called with certain arguments
       #
       # Examples:
       #   it { should delegate_method(:deliver_mail).to(:mailman).as(:deliver_with_haste)
-      #   it { should delegate_method(:deliver_mail).to(:mailman).with_arguments('221B Baker St.', :hastily => true)
+      #   it { should delegate_method(:deliver_mail).to(:mailman).
+      #     with_arguments('221B Baker St.', :hastily => true) }
       #
       def delegate_method(delegating_method)
         DelegateMatcher.new(delegating_method)
@@ -23,6 +27,7 @@ module Shoulda # :nodoc:
 
       class DelegateMatcher
         def initialize(delegating_method)
+          ActiveSupport::Deprecation.warn 'The delegate_method matcher is deprecated and will be removed in 2.0'
           @delegating_method = delegating_method
         end
 
@@ -37,12 +42,17 @@ module Shoulda # :nodoc:
             subject.stubs(@target_method).returns(stubbed_object)
             subject.send(@delegating_method)
 
-            stubbed_object.should have_received(method_on_target).with(*@delegated_arguments)
-          rescue NoMethodError, RSpec::Expectations::ExpectationNotMetError, Mocha::ExpectationError
+            matcher = Mocha::API::HaveReceived.new(method_on_target).with(*@delegated_arguments)
+            matcher.matches?(stubbed_object)
+          rescue NoMethodError, Mocha::ExpectationError
             false
           end
         end
 
+        def description
+          add_clarifications_to("delegate method ##{@delegating_method} to :#{@target_method}")
+        end
+
         def does_not_match?(subject)
           raise InvalidDelegateMatcher
         end
@@ -62,7 +72,7 @@ module Shoulda # :nodoc:
           self
         end
 
-        def failure_message
+        def failure_message_for_should
           base = "Expected #{delegating_method_name} to delegate to #{target_method_name}"
           add_clarifications_to(base)
         end
@@ -75,7 +85,7 @@ module Shoulda # :nodoc:
           end
 
           if @method_on_target.present?
-            message << " as :#{@method_on_target}"
+            message << " as ##{@method_on_target}"
           end
 
           message

data/lib/shoulda/matchers/integrations/rspec.rb

@@ -1,42 +1,28 @@
 # :enddoc:
+require 'rspec'
 
-require 'shoulda/matchers/independent'
-module RSpec::Matchers
-  include Shoulda::Matchers::Independent
-end
+RSpec.configure do |config|
+  require 'shoulda/matchers/independent'
+  config.include Shoulda::Matchers::Independent
 
-if defined?(::ActiveRecord)
-  require 'shoulda/matchers/active_record'
-  require 'shoulda/matchers/active_model'
-  module RSpec::Matchers
-    include Shoulda::Matchers::ActiveRecord
-    include Shoulda::Matchers::ActiveModel
-  end
-elsif defined?(::ActiveModel)
-  require 'shoulda/matchers/active_model'
-  module RSpec::Matchers
-    include Shoulda::Matchers::ActiveModel
+  if defined?(::ActiveRecord)
+    require 'shoulda/matchers/active_record'
+    require 'shoulda/matchers/active_model'
+    config.include Shoulda::Matchers::ActiveRecord
+    config.include Shoulda::Matchers::ActiveModel
+
+  elsif defined?(::ActiveModel)
+    require 'shoulda/matchers/active_model'
+    config.include Shoulda::Matchers::ActiveModel
   end
-end
 
-if defined?(::ActionController)
-  require 'shoulda/matchers/action_controller'
-  module RSpec
-    module Rails
-      module ControllerExampleGroup
-        include Shoulda::Matchers::ActionController
-      end
-    end
+  if defined?(::ActionController)
+    require 'shoulda/matchers/action_controller'
+    config.include Shoulda::Matchers::ActionController
   end
-end
 
-if defined?(::ActionMailer)
-  require 'shoulda/matchers/action_mailer'
-  module RSpec
-    module Rails
-      module MailerExampleGroup
-        include Shoulda::Matchers::ActionMailer
-      end
-    end
+  if defined?(::ActionMailer)
+    require 'shoulda/matchers/action_mailer'
+    config.include Shoulda::Matchers::ActionMailer
   end
 end

data/lib/shoulda/matchers/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Matchers
-    VERSION = '1.4.2'.freeze
+    VERSION = '1.5.0'.freeze
   end
 end

data/shoulda-matchers.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.email       = "support@thoughtbot.com"
   s.homepage    = "http://thoughtbot.com/community/"
   s.summary     = "Making tests easy on the fingers and eyes"
+  s.license     = "MIT"
   s.description = "Making tests easy on the fingers and eyes"
 
   s.files         = `git ls-files`.split("\n")
@@ -18,13 +19,14 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('activesupport', '>= 3.0.0')
-  s.add_dependency('bourne',        '~> 1.1.2')
+  s.add_dependency('bourne',        '~> 1.2.0')
 
-  s.add_development_dependency('appraisal',   '~> 0.4.0')
+  s.add_development_dependency('appraisal',   '~> 0.4')
   s.add_development_dependency('aruba')
   s.add_development_dependency('bundler',     '~> 1.1')
-  s.add_development_dependency('cucumber',    '~> 1.1.9')
+  s.add_development_dependency('cucumber',    '~> 1.1')
   s.add_development_dependency('rails',       '~> 3.0')
-  s.add_development_dependency('rake',        '~> 0.9.2')
+  s.add_development_dependency('rake',        '>= 0.9.2')
   s.add_development_dependency('rspec-rails', '~> 2.8.1')
+  s.add_development_dependency('strong_parameters')
 end

data/spec/shoulda/matchers/action_controller/assign_to_matcher_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Shoulda::Matchers::ActionController::AssignToMatcher do
+  it 'includes the actual class in the failure message' do
+    define_class(:WrongClass) do
+      def to_s
+        'wrong class'
+      end
+    end
+
+    controller = build_response { @var = WrongClass.new }
+    matcher = assign_to(:var).with_kind_of(Fixnum)
+    matcher.matches?(controller)
+
+    matcher.failure_message_for_should.should =~ /but got wrong class \(WrongClass\)$/
+  end
+
+  context 'a controller that assigns to an instance variable' do
+    it 'accepts assigning to that variable' do
+      controller.should assign_to(:var)
+    end
+
+    it 'accepts assigning to that variable with the correct class' do
+      controller.should assign_to(:var).with_kind_of(String)
+    end
+
+    it 'rejects assigning to that variable with another class' do
+      controller.should_not assign_to(:var).with_kind_of(Fixnum)
+    end
+
+    it 'accepts assigning the correct value to that variable' do
+      controller.should assign_to(:var).with('value')
+    end
+
+    it 'rejects assigning another value to that variable' do
+      controller.should_not assign_to(:var).with('other')
+    end
+
+    it 'rejects assigning to another variable' do
+      controller.should_not assign_to(:other)
+    end
+
+    it 'accepts assigning to the same value in the test context' do
+      expected = 'value'
+      controller.should assign_to(:var).in_context(self).with { expected }
+    end
+
+    it 'rejects assigning to the another value in the test context' do
+      expected = 'other'
+      controller.should_not assign_to(:var).in_context(self).with { expected }
+    end
+
+    def controller
+      build_response { @var = 'value' }
+    end
+  end
+
+  context 'a controller that assigns a nil value to an instance variable' do
+    it 'accepts assigning to that variable' do
+      controller = build_response do
+        @var = nil
+      end
+      controller.should assign_to(:var)
+    end
+  end
+end