shoulda-matchers 2.6.2 → 2.7.0

data/spec/spec_helper.rb

@@ -28,16 +28,15 @@ require 'rspec/rails'
 
 PROJECT_ROOT = File.expand_path('../..', __FILE__)
 $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
-Dir[ File.join(PROJECT_ROOT, 'spec/support/**/*.rb') ].each { |file| require file }
 
+Dir[ File.join(PROJECT_ROOT, 'spec/support/**/*.rb') ].each { |file| require file }
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
 
   config.mock_with :mocha
-  config.include Shoulda::Matchers::ActionController,
-                 example_group: { file_path: /action_controller/ }
+  config.include Shoulda::Matchers::ActionController, type: :controller
 end
 
 $VERBOSE = true

data/spec/support/fail_with_message_including_matcher.rb

@@ -1,4 +1,8 @@
 RSpec::Matchers.define :fail_with_message_including do |expected|
+  def supports_block_expectations?
+    true
+  end
+
   match do |block|
     @actual = nil
 
@@ -11,7 +15,7 @@ RSpec::Matchers.define :fail_with_message_including do |expected|
     @actual && @actual.include?(expected)
   end
 
-  failure_message_for_should do
+  def failure_message
     msg = "Expectation should have failed with message including '#{expected}'"
 
     if @actual
@@ -23,11 +27,18 @@ RSpec::Matchers.define :fail_with_message_including do |expected|
     msg
   end
 
-  failure_message_for_should_not do
+  def failure_message_for_should
+    failure_message
+  end
+
+  def failure_message_when_negated
     msg  = "Expectation should not have failed with message including '#{expected}'"
     msg << ", but did."
 
     msg
   end
 
-end
+  def failure_message_for_should_not
+    failure_message_when_negated
+  end
+end

data/spec/support/fail_with_message_matcher.rb

@@ -1,4 +1,8 @@
 RSpec::Matchers.define :fail_with_message do |expected|
+  def supports_block_expectations?
+    true
+  end
+
   match do |block|
     @actual = nil
 
@@ -11,7 +15,7 @@ RSpec::Matchers.define :fail_with_message do |expected|
     @actual && @actual == expected
   end
 
-  failure_message_for_should do
+  def failure_message
     msg = "Expectation should have failed with message '#{expected}'"
 
     if @actual
@@ -23,10 +27,18 @@ RSpec::Matchers.define :fail_with_message do |expected|
     msg
   end
 
-  failure_message_for_should_not do
+  def failure_message_for_should
+    failure_message
+  end
+
+  def failure_message_when_negated
     msg  = "Expectation should not have failed with message '#{expected}'"
     msg << ", but did."
 
     msg
   end
+
+  def failure_message_for_should_not
+    failure_message_when_negated
+  end
 end

data/spec/support/rails_versions.rb

@@ -14,6 +14,10 @@ module RailsVersions
   def rails_gte_4_1?
     Gem::Requirement.new('>= 4.1').satisfied_by?(rails_version)
   end
+
+  def active_record_supports_enum?
+    defined?(::ActiveRecord::Enum)
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.0
 platform: ruby
 authors:
 - Tammer Saleh
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -110,8 +110,6 @@ files:
 - 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
@@ -126,6 +124,8 @@ files:
 - lib/shoulda/matchers/active_model/validate_absence_of_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_exclusion_of_matcher.rb
+- lib/shoulda/matchers/active_model/validate_inclusion_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_numericality_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_presence_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_uniqueness_of_matcher.rb
@@ -138,12 +138,14 @@ files:
 - lib/shoulda/matchers/active_record/association_matchers/counter_cache_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/dependent_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/inverse_of_matcher.rb
+- lib/shoulda/matchers/active_record/association_matchers/join_table_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/model_reflection.rb
 - lib/shoulda/matchers/active_record/association_matchers/model_reflector.rb
 - lib/shoulda/matchers/active_record/association_matchers/option_verifier.rb
 - lib/shoulda/matchers/active_record/association_matchers/order_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/source_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/through_matcher.rb
+- lib/shoulda/matchers/active_record/define_enum_for_matcher.rb
 - lib/shoulda/matchers/active_record/have_db_column_matcher.rb
 - lib/shoulda/matchers/active_record/have_db_index_matcher.rb
 - lib/shoulda/matchers/active_record/have_readonly_attribute_matcher.rb
@@ -160,8 +162,9 @@ files:
 - lib/shoulda/matchers/doublespeak/world.rb
 - lib/shoulda/matchers/error.rb
 - lib/shoulda/matchers/independent.rb
-- lib/shoulda/matchers/independent/delegate_matcher.rb
-- lib/shoulda/matchers/independent/delegate_matcher/stubbed_target.rb
+- lib/shoulda/matchers/independent/delegate_method_matcher.rb
+- lib/shoulda/matchers/independent/delegate_method_matcher/stubbed_target.rb
+- lib/shoulda/matchers/independent/delegate_method_matcher/target_not_defined_error.rb
 - lib/shoulda/matchers/integrations/nunit_test_case_detection.rb
 - lib/shoulda/matchers/integrations/rspec.rb
 - lib/shoulda/matchers/integrations/test_unit.rb
@@ -188,8 +191,6 @@ files:
 - spec/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_value_matcher_spec.rb
 - spec/shoulda/matchers/active_model/disallow_value_matcher_spec.rb
-- spec/shoulda/matchers/active_model/ensure_exclusion_of_matcher_spec.rb
-- spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/ensure_length_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/exception_message_finder_spec.rb
 - spec/shoulda/matchers/active_model/have_secure_password_matcher_spec.rb
@@ -201,6 +202,8 @@ files:
 - spec/shoulda/matchers/active_model/validate_absence_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_acceptance_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_confirmation_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_exclusion_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_inclusion_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_numericality_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb
@@ -208,6 +211,7 @@ files:
 - spec/shoulda/matchers/active_record/accept_nested_attributes_for_matcher_spec.rb
 - spec/shoulda/matchers/active_record/association_matcher_spec.rb
 - spec/shoulda/matchers/active_record/association_matchers/model_reflection_spec.rb
+- spec/shoulda/matchers/active_record/define_enum_for_matcher_spec.rb
 - spec/shoulda/matchers/active_record/have_db_column_matcher_spec.rb
 - spec/shoulda/matchers/active_record/have_db_index_matcher_spec.rb
 - spec/shoulda/matchers/active_record/have_readonly_attributes_matcher_spec.rb
@@ -220,8 +224,8 @@ files:
 - spec/shoulda/matchers/doublespeak/stub_implementation_spec.rb
 - spec/shoulda/matchers/doublespeak/world_spec.rb
 - spec/shoulda/matchers/doublespeak_spec.rb
-- spec/shoulda/matchers/independent/delegate_matcher/stubbed_target_spec.rb
-- spec/shoulda/matchers/independent/delegate_matcher_spec.rb
+- spec/shoulda/matchers/independent/delegate_method_matcher/stubbed_target_spec.rb
+- spec/shoulda/matchers/independent/delegate_method_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_versions.rb
 - spec/support/active_resource_builder.rb
@@ -289,8 +293,6 @@ test_files:
 - spec/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_value_matcher_spec.rb
 - spec/shoulda/matchers/active_model/disallow_value_matcher_spec.rb
-- spec/shoulda/matchers/active_model/ensure_exclusion_of_matcher_spec.rb
-- spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/ensure_length_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/exception_message_finder_spec.rb
 - spec/shoulda/matchers/active_model/have_secure_password_matcher_spec.rb
@@ -302,6 +304,8 @@ test_files:
 - spec/shoulda/matchers/active_model/validate_absence_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_acceptance_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_confirmation_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_exclusion_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_inclusion_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_numericality_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb
@@ -309,6 +313,7 @@ test_files:
 - spec/shoulda/matchers/active_record/accept_nested_attributes_for_matcher_spec.rb
 - spec/shoulda/matchers/active_record/association_matcher_spec.rb
 - spec/shoulda/matchers/active_record/association_matchers/model_reflection_spec.rb
+- spec/shoulda/matchers/active_record/define_enum_for_matcher_spec.rb
 - spec/shoulda/matchers/active_record/have_db_column_matcher_spec.rb
 - spec/shoulda/matchers/active_record/have_db_index_matcher_spec.rb
 - spec/shoulda/matchers/active_record/have_readonly_attributes_matcher_spec.rb
@@ -321,8 +326,8 @@ test_files:
 - spec/shoulda/matchers/doublespeak/stub_implementation_spec.rb
 - spec/shoulda/matchers/doublespeak/world_spec.rb
 - spec/shoulda/matchers/doublespeak_spec.rb
-- spec/shoulda/matchers/independent/delegate_matcher/stubbed_target_spec.rb
-- spec/shoulda/matchers/independent/delegate_matcher_spec.rb
+- spec/shoulda/matchers/independent/delegate_method_matcher/stubbed_target_spec.rb
+- spec/shoulda/matchers/independent/delegate_method_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_versions.rb
 - spec/support/active_resource_builder.rb

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

@@ -1,35 +0,0 @@
-module Shoulda
-  module Matchers
-    module Independent
-      # @private
-      class DelegateMatcher::StubbedTarget # :nodoc:
-        def initialize(method)
-          @received_method = false
-          @received_arguments = []
-          stub_method(method)
-        end
-
-        def has_received_method?
-          received_method
-        end
-
-        def has_received_arguments?(*args)
-          args == received_arguments
-        end
-
-        protected
-
-        def stub_method(method)
-          class_eval do
-            define_method method do |*args|
-              @received_method = true
-              @received_arguments = args
-            end
-          end
-        end
-
-        attr_reader :received_method, :received_arguments
-      end
-    end
-  end
-end