shoulda-matchers 3.0.0.rc1 → 3.0.0

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

@@ -14,7 +14,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class ProcessTest < ActiveSupport::TestCase
       #       should define_enum_for(:status)
       #     end
@@ -38,7 +38,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class ProcessTest < ActiveSupport::TestCase
       #       should define_enum_for(:status).
       #         with([:running, :stopped, :suspended])

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

@@ -17,7 +17,7 @@ module Shoulda
       #       it { should have_db_column(:supported_ios_version) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PhoneTest < ActiveSupport::TestCase
       #       should have_db_column(:supported_ios_version)
       #     end
@@ -43,7 +43,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PhoneTest < ActiveSupport::TestCase
       #       should have_db_column(:camera_aperture).of_type(:decimal)
       #     end
@@ -70,7 +70,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PhoneTest < ActiveSupport::TestCase
       #       should have_db_column(:camera_aperture).
       #         with_options(precision: 1, null: false)
@@ -118,12 +118,10 @@ module Shoulda
         def failure_message
           "Expected #{expectation} (#{@missing})"
         end
-        alias failure_message_for_should failure_message
 
         def failure_message_when_negated
           "Did not expect #{expectation}"
         end
-        alias failure_message_for_should_not failure_message_when_negated
 
         def description
           desc = "have db column named #{@column}"

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

@@ -19,7 +19,7 @@ module Shoulda
       #       it { should have_db_index(:user_id) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class BlogTest < ActiveSupport::TestCase
       #       should have_db_index(:user_id)
       #     end
@@ -45,7 +45,7 @@ module Shoulda
       #       it { should have_db_index(:name).unique(true) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class BlogTest < ActiveSupport::TestCase
       #       should have_db_index(:name).unique(true)
       #     end
@@ -58,7 +58,7 @@ module Shoulda
       #       it { should have_db_index(:name).unique }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class BlogTest < ActiveSupport::TestCase
       #       should have_db_index(:name).unique
       #     end
@@ -89,12 +89,10 @@ module Shoulda
         def failure_message
           "Expected #{expectation} (#{@missing})"
         end
-        alias failure_message_for_should failure_message
 
         def failure_message_when_negated
           "Did not expect #{expectation}"
         end
-        alias failure_message_for_should_not failure_message_when_negated
 
         def description
           if @options.key?(:unique)

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

@@ -13,7 +13,7 @@ module Shoulda
       #       it { should have_readonly_attribute(:password) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should have_readonly_attribute(:password)
       #     end
@@ -32,9 +32,6 @@ module Shoulda
 
         attr_reader :failure_message, :failure_message_when_negated
 
-        alias failure_message_for_should failure_message
-        alias failure_message_for_should_not failure_message_when_negated
-
         def matches?(subject)
           @subject = subject
           if readonly_attributes.include?(@attribute)

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

@@ -12,7 +12,7 @@ module Shoulda
       #       it { should serialize(:customizations) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class ProductTest < ActiveSupport::TestCase
       #       should serialize(:customizations)
       #     end
@@ -45,7 +45,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class ProductTest < ActiveSupport::TestCase
       #       should serialize(:specifications).
       #         as(ProductSpecsSerializer)
@@ -77,7 +77,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class ProductTest < ActiveSupport::TestCase
       #       should serialize(:options).
       #         as_instance_of(ProductOptionsSerializer)
@@ -114,12 +114,10 @@ module Shoulda
         def failure_message
           "Expected #{expectation} (#{@missing})"
         end
-        alias failure_message_for_should failure_message
 
         def failure_message_when_negated
           "Did not expect #{expectation}"
         end
-        alias failure_message_for_should_not failure_message_when_negated
 
         def description
           description = "serialize :#{@name}"

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

@@ -18,7 +18,7 @@ module Shoulda
       #       it { should validate_uniqueness_of(:permalink) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PostTest < ActiveSupport::TestCase
       #       should validate_uniqueness_of(:permalink)
       #     end
@@ -99,7 +99,7 @@ module Shoulda
       #       it { should validate_uniqueness_of(:title).on(:create) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PostTest < ActiveSupport::TestCase
       #       should validate_uniqueness_of(:title).on(:create)
       #     end
@@ -120,7 +120,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PostTest < ActiveSupport::TestCase
       #       should validate_uniqueness_of(:title).
       #         with_message('Please choose another title')
@@ -141,7 +141,7 @@ module Shoulda
       #       it { should validate_uniqueness_of(:slug).scoped_to(:journal_id) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PostTest < ActiveSupport::TestCase
       #       should validate_uniqueness_of(:slug).scoped_to(:journal_id)
       #     end
@@ -162,7 +162,7 @@ module Shoulda
       #       it { should validate_uniqueness_of(:key).case_insensitive }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PostTest < ActiveSupport::TestCase
       #       should validate_uniqueness_of(:key).case_insensitive
       #     end
@@ -180,7 +180,7 @@ module Shoulda
       #       it { should validate_uniqueness_of(:author_id).allow_nil }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PostTest < ActiveSupport::TestCase
       #       should validate_uniqueness_of(:author_id).allow_nil
       #     end
@@ -200,7 +200,7 @@ module Shoulda
       #       it { should validate_uniqueness_of(:author_id).allow_blank }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PostTest < ActiveSupport::TestCase
       #       should validate_uniqueness_of(:author_id).allow_blank
       #     end

data/lib/shoulda/matchers/doublespeak/double.rb

@@ -12,6 +12,14 @@ module Shoulda
           @implementation = implementation
           @activated = false
           @calls = []
+
+          if world.doubles_activated?
+            activate
+          end
+        end
+
+        def activated?
+          @activated
         end
 
         def to_return(value = nil, &block)
@@ -73,7 +81,8 @@ module Shoulda
               object: self,
               method_name: _method_name,
               args: args,
-              block: block
+              block: block,
+              caller: caller
             )
             implementation.call(call)
           end

data/lib/shoulda/matchers/doublespeak/double_collection.rb

@@ -29,6 +29,12 @@ module Shoulda
           end
         end
 
+        def calls_by_method_name
+          doubles_by_method_name.reduce({}) do |hash, (method_name, double)|
+            hash.merge method_name => double.calls.map(&:args)
+          end
+        end
+
         def calls_to(method_name)
           double = doubles_by_method_name[method_name]
 
@@ -44,11 +50,13 @@ module Shoulda
         attr_reader :world, :klass, :doubles_by_method_name
 
         def register_double(method_name, implementation_type)
-          implementation =
-            DoubleImplementationRegistry.find(implementation_type)
-          double = Double.new(world, klass, method_name, implementation)
-          doubles_by_method_name[method_name] = double
-          double
+          doubles_by_method_name.fetch(method_name) do
+            implementation =
+              DoubleImplementationRegistry.find(implementation_type)
+            double = Double.new(world, klass, method_name, implementation)
+            doubles_by_method_name[method_name] = double
+            double
+          end
         end
       end
     end

data/lib/shoulda/matchers/doublespeak/method_call.rb

@@ -4,11 +4,12 @@ module Shoulda
       # @private
       class MethodCall
         attr_accessor :return_value
-        attr_reader :method_name, :args, :block, :object, :double
+        attr_reader :method_name, :args, :caller, :block, :object, :double
 
         def initialize(args)
           @method_name = args.fetch(:method_name)
           @args = args.fetch(:args)
+          @caller = args.fetch(:caller)
           @block = args[:block]
           @double = args[:double]
           @object = args[:object]
@@ -29,6 +30,14 @@ module Shoulda
             double == other.double &&
             object == other.object
         end
+
+        def to_hash
+          { method_name: method_name, args: args }
+        end
+
+        def inspect
+          "#<#{self.class.name} #{to_hash.inspect}>"
+        end
       end
     end
   end

data/lib/shoulda/matchers/doublespeak/object_double.rb

@@ -22,7 +22,8 @@ module Shoulda
           call = MethodCall.new(
             method_name: method_name,
             args: args,
-            block: block
+            block: block,
+            caller: ::Kernel.caller
           )
           calls << call
           (calls_by_method_name[method_name] ||= []) << call

data/lib/shoulda/matchers/doublespeak/world.rb

@@ -3,6 +3,10 @@ module Shoulda
     module Doublespeak
       # @private
       class World
+        def initialize
+          @doubles_activated = false
+        end
+
         def double_collection_for(klass)
           double_collections_by_class[klass] ||=
             DoubleCollection.new(self, klass)
@@ -20,12 +24,18 @@ module Shoulda
         end
 
         def with_doubles_activated
+          @doubles_activated = true
           activate
           yield
         ensure
+          @doubles_activated = false
           deactivate
         end
 
+        def doubles_activated?
+          @doubles_activated
+        end
+
         private
 
         def activate

data/lib/shoulda/matchers/error.rb

@@ -20,6 +20,10 @@ module Shoulda
       def message
         ""
       end
+
+      def inspect
+        %(#<#{self.class}: #{message}>)
+      end
     end
   end
 end

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

@@ -1,3 +1,6 @@
+require 'shoulda/matchers/doublespeak'
+require 'shoulda/matchers/matcher_context'
+
 module Shoulda
   module Matchers
     module Independent
@@ -26,8 +29,8 @@ module Shoulda
       #       it { should delegate_method(:deliver).to(:post_office) }
       #     end
       #
-      #     # Test::Unit
-      #     class CourierTest < Test::Unit::TestCase
+      #     # Minitest
+      #     class CourierTest < Minitest::Test
       #       should delegate_method(:deliver).to(:post_office)
       #     end
       #
@@ -77,8 +80,8 @@ module Shoulda
       #       it { should delegate_method(:deliver).to(:post_office).as(:ship) }
       #     end
       #
-      #     # Test::Unit
-      #     class CourierTest < Test::Unit::TestCase
+      #     # Minitest
+      #     class CourierTest < Minitest::Test
       #       should delegate_method(:deliver).to(:post_office).as(:ship)
       #     end
       #
@@ -100,8 +103,8 @@ module Shoulda
       #       it { should delegate_method(:title).to(:site).with_prefix(:root) }
       #     end
       #
-      #     # Test::Unit
-      #     class PageTest < Test::Unit::TestCase
+      #     # Minitest
+      #     class PageTest < Minitest::Test
       #       should delegate_method(:name).to(:site).with_prefix
       #       should delegate_method(:name).to(:site).with_prefix(true)
       #       should delegate_method(:title).to(:site).with_prefix(:root)
@@ -138,8 +141,8 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
-      #     class CourierTest < Test::Unit::TestCase
+      #     # Minitest
+      #     class CourierTest < Minitest::Test
       #       should delegate_method(:deliver_package).
       #         to(:post_office).
       #         with_arguments(expedited: true)
@@ -230,12 +233,10 @@ module Shoulda
             "#{formatted_delegate_object_reader_method_name(include_module: true)}:" +
             formatted_calls_on_delegate_object
         end
-        alias failure_message_for_should failure_message
 
         def failure_message_when_negated
           "Expected #{class_under_test} not to #{description}, but it did"
         end
-        alias failure_message_for_should_not failure_message_when_negated
 
         protected
 

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

@@ -3,6 +3,7 @@ require 'shoulda/matchers/integrations/libraries/active_model'
 require 'shoulda/matchers/integrations/libraries/active_record'
 require 'shoulda/matchers/integrations/libraries/missing_library'
 require 'shoulda/matchers/integrations/libraries/rails'
+require 'shoulda/matchers/integrations/libraries/routing'
 
 module Shoulda
   module Matchers

data/lib/shoulda/matchers/integrations/libraries/action_controller.rb

@@ -10,7 +10,7 @@ module Shoulda
           include Integrations::Rails
 
           def integrate_with(test_framework)
-            test_framework.include(matchers_module)
+            test_framework.include(matchers_module, type: :controller)
 
             include_into(::ActionController::TestCase, matchers_module) do
               def subject

data/lib/shoulda/matchers/integrations/libraries/active_model.rb

@@ -10,7 +10,7 @@ module Shoulda
           include Integrations::Rails
 
           def integrate_with(test_framework)
-            test_framework.include(matchers_module)
+            test_framework.include(matchers_module, type: :model)
             include_into(ActiveSupport::TestCase, matchers_module)
           end