rspec-expectations 2.5.0 → 2.6.0.rc2

data/features/built_in_matchers/respond_to.feature

@@ -41,7 +41,7 @@ Feature: respond_to matcher
         it { should_not respond_to(:length, :flatten) }
       end
       """
-    When I run "rspec respond_to_matcher_spec.rb"
+    When I run `rspec respond_to_matcher_spec.rb`
     Then the output should contain all of these:
       | 10 examples, 6 failures                                    |
       | expected "a string" to respond to :to_model                |
@@ -69,7 +69,7 @@ Feature: respond_to matcher
         it { should_not respond_to(:between?).with(2).arguments }
       end
       """
-    When I run "rspec respond_to_matcher_argument_checking_spec.rb"
+    When I run `rspec respond_to_matcher_argument_checking_spec.rb`
     Then the output should contain all of these:
       | 8 examples, 4 failures                                  |
       | expected 7 to respond to :zero? with 1 argument         |

data/features/built_in_matchers/satisfy.feature

@@ -23,7 +23,7 @@ Feature: satisfy matcher
         it { should satisfy { |v| v > 15 } }
       end
       """
-    When I run "rspec satisfy_matcher_spec.rb"
+    When I run `rspec satisfy_matcher_spec.rb`
     Then the output should contain all of these:
       | 4 examples, 2 failures           |
       | expected 10 not to satisfy block |

data/features/built_in_matchers/throw_symbol.feature

@@ -28,7 +28,7 @@ Feature: throw_symbol matcher
         specify { expect { 5 + 5         }.to     throw_symbol }
       end
       """
-    When I run "rspec throw_symbol_matcher_spec.rb"
+    When I run `rspec throw_symbol_matcher_spec.rb`
     Then the output should contain all of these:
       | 6 examples, 3 failures                      |
       | expected no Symbol to be thrown, got :foo   |
@@ -51,7 +51,7 @@ Feature: throw_symbol matcher
         specify { expect { throw :bar    }.to     throw_symbol(:foo) }
       end
       """
-    When I run "rspec throw_symbol_matcher_spec.rb"
+    When I run `rspec throw_symbol_matcher_spec.rb`
     Then the output should contain all of these:
       | 8 examples, 4 failures                          |
       | expected :foo not to be thrown, got :foo        |
@@ -75,7 +75,7 @@ Feature: throw_symbol matcher
         specify { expect { throw :foo    }.to     throw_symbol(:foo, 7) }
       end
       """
-    When I run "rspec throw_symbol_argument_matcher_spec.rb"
+    When I run `rspec throw_symbol_argument_matcher_spec.rb`
     Then the output should contain all of these:
       | 8 examples, 4 failures                                       |
       | expected :foo with 7 not to be thrown, got :foo with 7       |

data/features/built_in_matchers/types.feature

@@ -60,7 +60,7 @@ Feature: specify types of objects
         it { should be_a(String) }
       end
       """
-    When I run "rspec be_kind_of_matcher_spec.rb"
+    When I run `rspec be_kind_of_matcher_spec.rb`
     Then the output should contain all of these:
       | 24 examples, 12 failures                 |
       | expected 17 not to be a kind of Fixnum   |
@@ -105,7 +105,7 @@ Feature: specify types of objects
         it { should be_an_instance_of(String) }
       end
       """
-    When I run "rspec be_instance_of_matcher_spec.rb"
+    When I run `rspec be_instance_of_matcher_spec.rb`
     Then the output should contain all of these:
       | 16 examples, 8 failures                     |
       | expected 17 not to be an instance of Fixnum |

data/features/custom_matchers/access_running_example.feature

@@ -28,7 +28,7 @@ Feature: access running example
         end
       end
       """
-    When I run "rspec ./example_spec.rb"
+    When I run `rspec ./example_spec.rb`
     Then the output should contain "1 example, 0 failures"
 
   Scenario: call method _not_ defined on example from matcher
@@ -46,7 +46,7 @@ Feature: access running example
         end
       end
       """
-    When I run "rspec ./example_spec.rb"
+    When I run `rspec ./example_spec.rb`
     Then the output should contain "1 example, 1 failure"
     And the output should contain "undefined local variable"
     And the output should contain "RSpec::Matchers::Matcher"

data/features/custom_matchers/define_diffable_matcher.feature

@@ -20,7 +20,7 @@ Feature: define diffable matcher
         it {should be_just_like("that")}
       end
       """
-    When I run "rspec ./diffable_matcher_spec.rb --diff"
+    When I run `rspec ./diffable_matcher_spec.rb --diff`
     Then the exit status should not be 0
 
     And the output should contain "should be just like that"

data/features/custom_matchers/define_matcher.feature

@@ -34,7 +34,7 @@ Feature: define matcher
       end
 
       """
-    When I run "rspec ./matcher_with_default_message_spec.rb --format documentation"
+    When I run `rspec ./matcher_with_default_message_spec.rb --format documentation`
     Then the exit status should not be 0
 
     And the output should contain "should be a multiple of 3"
@@ -65,7 +65,7 @@ Feature: define matcher
         it {should be_a_multiple_of(4)}
       end
       """
-    When I run "rspec ./matcher_with_failure_message_spec.rb"
+    When I run `rspec ./matcher_with_failure_message_spec.rb`
     Then the exit status should not be 0
     And the stdout should contain "1 example, 1 failure"
     And the stdout should contain "expected that 9 would be a multiple of 4"
@@ -89,7 +89,7 @@ Feature: define matcher
         it {should_not be_a_multiple_of(3)}
       end
       """
-    When I run "rspec ./matcher_with_failure_for_message_spec.rb"
+    When I run `rspec ./matcher_with_failure_for_message_spec.rb`
     Then the exit status should not be 0
     And the stdout should contain "1 example, 1 failure"
     And the stdout should contain "expected that 9 would not be a multiple of 3"
@@ -116,7 +116,7 @@ Feature: define matcher
         it {should_not be_a_multiple_of(4)}
       end
       """
-    When I run "rspec ./matcher_overriding_description_spec.rb --format documentation"
+    When I run `rspec ./matcher_overriding_description_spec.rb --format documentation`
     Then the exit status should be 0
     And the stdout should contain "2 examples, 0 failures"
     And the stdout should contain "should be multiple of 3"
@@ -141,7 +141,7 @@ Feature: define matcher
         it {should have_7_fingers}
       end
       """
-    When I run "rspec ./matcher_with_no_args_spec.rb --format documentation"
+    When I run `rspec ./matcher_with_no_args_spec.rb --format documentation`
     Then the exit status should be 0
     And the stdout should contain "1 example, 0 failures"
     And the stdout should contain "should have 7 fingers"
@@ -161,7 +161,7 @@ Feature: define matcher
         it {should be_the_sum_of(1,2,3,4)}
       end
       """
-    When I run "rspec ./matcher_with_multiple_args_spec.rb --format documentation"
+    When I run `rspec ./matcher_with_multiple_args_spec.rb --format documentation`
     Then the exit status should be 0
     And the stdout should contain "1 example, 0 failures"
     And the stdout should contain "should be the sum of 1, 2, 3, and 4"
@@ -187,7 +187,7 @@ Feature: define matcher
         end
       end
       """
-    When I run "rspec ./matcher_with_internal_helper_spec.rb"
+    When I run `rspec ./matcher_with_internal_helper_spec.rb`
     Then the exit status should be 0
     And the stdout should contain "1 example, 0 failures"
 
@@ -220,7 +220,7 @@ Feature: define matcher
       end
       """
 
-    When I run "rspec ./scoped_matcher_spec.rb"
+    When I run `rspec ./scoped_matcher_spec.rb`
     Then the stdout should contain "2 examples, 0 failures"
 
   Scenario: scoped in an example group
@@ -254,7 +254,7 @@ Feature: define matcher
       end
       """
 
-    When I run "rspec scoped_matcher_spec.rb"
+    When I run `rspec scoped_matcher_spec.rb`
     Then the output should contain "3 examples, 0 failures"
 
   Scenario: matcher with separate logic for should and should_not
@@ -279,7 +279,7 @@ Feature: define matcher
         it { should_not contain(1, 4) }
       end
       """
-    When I run "rspec matcher_with_separate_should_not_logic_spec.rb"
+    When I run `rspec matcher_with_separate_should_not_logic_spec.rb`
     Then the output should contain all of these:
       | 4 examples, 2 failures                    |
       | expected [1, 2, 3] to contain 1 and 4     |
@@ -304,7 +304,36 @@ Feature: define matcher
         it { should_not be_a_multiple_of(3) }
       end
       """
-    When I run "rspec define_method_spec.rb"
+    When I run `rspec define_method_spec.rb`
+    Then the output should contain all of these:
+      | 4 examples, 2 failures               |
+      | expected 9 to be a multiple of 2     |
+      | expected 9 not to be a multiple of 3 |
+
+  Scenario: include a module with helper methods in the matcher
+    Given a file named "include_module_spec.rb" with:
+      """
+      module MatcherHelpers
+        def is_multiple?(actual, expected)
+          actual % expected == 0
+        end
+      end
+
+      RSpec::Matchers.define :be_a_multiple_of do |expected|
+        include MatcherHelpers
+        match { |actual| is_multiple?(actual, expected) }
+      end
+
+      describe 9 do
+        it { should be_a_multiple_of(3) }
+        it { should_not be_a_multiple_of(4) }
+
+        # deliberate failures
+        it { should be_a_multiple_of(2) }
+        it { should_not be_a_multiple_of(3) }
+      end
+      """
+    When I run `rspec include_module_spec.rb`
     Then the output should contain all of these:
       | 4 examples, 2 failures               |
       | expected 9 to be a multiple of 2     |

data/features/custom_matchers/define_matcher_outside_rspec.feature

@@ -32,7 +32,7 @@ Feature: define matcher outside rspec
         
       end
       """
-    When I run "ruby test_multiples.rb"
+    When I run `ruby test_multiples.rb`
     Then the exit status should not be 0 
     And the output should contain "expected 9 to be a multiple of 4"
     And the output should contain "2 tests, 0 assertions, 0 failures, 1 errors"

data/features/custom_matchers/define_matcher_with_fluent_interface.feature

@@ -19,6 +19,6 @@ Feature: define matcher with fluent interface
         it { should be_bigger_than(4).but_smaller_than(6) }
       end
       """
-    When I run "rspec between_spec.rb --format documentation"
+    When I run `rspec between_spec.rb --format documentation`
     Then the output should contain "1 example, 0 failures"
     And  the output should contain "should be bigger than 4"

data/features/customized_message.feature

@@ -18,5 +18,5 @@ Feature: customized message
       end
 
       """
-    When I run "rspec example_spec.rb --format documentation"
+    When I run `rspec example_spec.rb --format documentation`
     Then the output should contain "expected empty array, got [1]"

data/features/diffing.feature

@@ -21,7 +21,7 @@ Feature: diffing
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain:
       """
              Diff:
@@ -47,7 +47,7 @@ Feature: diffing
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain:
       """
              Diff:
@@ -69,7 +69,7 @@ Feature: diffing
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should not contain "Diff:"
 
   Scenario: no diff for numbers
@@ -81,5 +81,5 @@ Feature: diffing
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should not contain "Diff:"

data/features/implicit_docstrings.feature

@@ -18,7 +18,7 @@ Feature: implicit docstrings
     end
     """
 
-    When I run "rspec ./implicit_docstrings_spec.rb -fdoc"
+    When I run `rspec ./implicit_docstrings_spec.rb -fdoc`
 
     Then the output should contain "should be < 5"
     And the output should contain "should include 2"
@@ -44,7 +44,7 @@ Feature: implicit docstrings
     end
     """
 
-    When I run "rspec ./failing_implicit_docstrings_spec.rb -fdoc"
+    When I run `rspec ./failing_implicit_docstrings_spec.rb -fdoc`
 
     Then the output should contain "should equal 2"
     And the output should contain "should be > 5"

data/features/step_definitions/additional_cli_steps.rb

@@ -1,7 +1,7 @@
 # Useful for when the output is slightly different on different versions of ruby
 Then /^the output should contain "([^"]*)" or "([^"]*)"$/ do |string1, string2|
-  unless [string1, string2].any? { |s| combined_output =~ Regexp.compile(s) }
-    fail %Q{Neither "#{string1}" or "#{string2}" were found in:\n#{combined_output}}
+  unless [string1, string2].any? { |s| all_output =~ regexp(s) }
+    fail %Q{Neither "#{string1}" or "#{string2}" were found in:\n#{all_output}}
   end
 end
 

data/features/support/env.rb

@@ -1 +1,5 @@
-require 'aruba'
+require 'aruba/cucumber'
+
+Before do
+  @aruba_timeout_seconds = 3
+end

data/features/test_frameworks/test_unit.feature

@@ -40,7 +40,7 @@ Feature: Test::Unit integration
         end
       end
       """
-     When I run "ruby rspec_expectations_test.rb"
+     When I run `ruby rspec_expectations_test.rb`
      Then the output should contain "4 tests, 0 assertions, 1 failures, 0 errors" or "4 tests, 0 assertions, 0 failures, 1 errors"
       And the output should contain "expected empty? to return true, got false"
       And the output should contain "be_an_int is deprecated"

data/lib/rspec/expectations/backward_compatibility.rb

@@ -3,7 +3,28 @@ module RSpec
   module Expectations
     module ConstMissing
       def const_missing(name)
-        name == :Rspec ? RSpec : super(name)
+        case name
+        when :Rspec, :Spec
+          RSpec.warn_deprecation <<-WARNING
+*****************************************************************
+DEPRECATION WARNING: you are using a deprecated constant that will
+be removed from a future version of RSpec.
+
+#{caller(0)[2]}
+
+* #{name} is deprecated.
+* RSpec is the new top-level module in RSpec-2
+***************************************************************
+WARNING
+          RSpec
+        else
+          begin
+            super
+          rescue Exception => e
+            e.backtrace.reject! {|l| l =~ Regexp.compile(__FILE__) }
+            raise e
+          end
+        end
       end
     end
 

data/lib/rspec/expectations/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Expectations # :nodoc:
     module Version # :nodoc:
-      STRING = '2.5.0'
+      STRING = '2.6.0.rc2'
     end
   end
 end

data/lib/rspec/matchers.rb

@@ -16,7 +16,7 @@ module RSpec
   #
   # In addition to those Expression Matchers that are defined explicitly, RSpec will
   # create custom Matchers on the fly for any arbitrary predicate, giving your specs
-  # a much more natural language feel. 
+  # a much more natural language feel.
   #
   # A Ruby predicate is a method that ends with a "?" and returns true or false.
   # Common examples are +empty?+, +nil?+, and +instance_of?+.
@@ -155,13 +155,18 @@ module RSpec
   #   end
   #
   module Matchers
-    # Include Matchers for other test frameworks
-    if defined?(Test::Unit::TestCase)
-      Test::Unit::TestCase.send(:include, self)
-    end
+    # Include Matchers for other test frameworks.
+    # Note that MiniTest _must_ come before TU because on ruby 1.9,
+    # T::U::TC is a subclass of MT::U::TC and a 1.9 bug can lead
+    # to infinite recursion from the `super` call in our method_missing
+    # hook.  See this gist for more info:
+    #   https://gist.github.com/845896
     if defined?(MiniTest::Unit::TestCase)
       MiniTest::Unit::TestCase.send(:include, self)
     end
+    if defined?(Test::Unit::TestCase)
+      Test::Unit::TestCase.send(:include, self)
+    end
   end
 end
 

data/lib/rspec/matchers/change.rb

@@ -1,23 +1,21 @@
 module RSpec
   module Matchers
-    
-    #Based on patch from Wilson Bilkovich
     class Change #:nodoc:
       def initialize(receiver=nil, message=nil, &block)
         @message = message
         @value_proc = block || lambda {receiver.__send__(message)}
-        @to = @from = @minimum = @maximum = @amount = nil
-        @given_from = @given_to = false
+        @expected_after = @expected_before = @minimum = @maximum = @expected_delta = nil
+        @eval_before = @eval_after = false
       end
       
       def matches?(event_proc)
         raise_block_syntax_error if block_given?
         
-        @before = evaluate_value_proc
+        @actual_before = evaluate_value_proc
         event_proc.call
-        @after = evaluate_value_proc
+        @actual_after = evaluate_value_proc
       
-        (!change_expected? || changed?) && matches_before? && matches_after? && matches_amount? && matches_min? && matches_max?
+        (!change_expected? || changed?) && matches_before? && matches_after? && matches_expected_delta? && matches_min? && matches_max?
       end
 
       def raise_block_syntax_error
@@ -28,35 +26,40 @@ MESSAGE
       end
       
       def evaluate_value_proc
-        @value_proc.call
+        case val = @value_proc.call
+        when Array, Hash
+          val.dup
+        else
+          val
+        end
       end
       
       def failure_message_for_should
-        if @given_from && @before != @from
-          "#{message} should have initially been #{@from.inspect}, but was #{@before.inspect}"
-        elsif @given_to && @to != @after
-          "#{message} should have been changed to #{@to.inspect}, but is now #{@after.inspect}"
-        elsif @amount
-          "#{message} should have been changed by #{@amount.inspect}, but was changed by #{actual_delta.inspect}"
+        if @eval_before && !expected_matches_actual?(@expected_before, @actual_before)
+          "#{message} should have initially been #{@expected_before.inspect}, but was #{@actual_before.inspect}"
+        elsif @eval_after && !expected_matches_actual?(@expected_after, @actual_after)
+          "#{message} should have been changed to #{@expected_after.inspect}, but is now #{@actual_after.inspect}"
+        elsif @expected_delta
+          "#{message} should have been changed by #{@expected_delta.inspect}, but was changed by #{actual_delta.inspect}"
         elsif @minimum
           "#{message} should have been changed by at least #{@minimum.inspect}, but was changed by #{actual_delta.inspect}"
         elsif @maximum
           "#{message} should have been changed by at most #{@maximum.inspect}, but was changed by #{actual_delta.inspect}"
         else
-          "#{message} should have changed, but is still #{@before.inspect}"
+          "#{message} should have changed, but is still #{@actual_before.inspect}"
         end
       end
       
       def actual_delta
-        @after - @before
+        @actual_after - @actual_before
       end
       
       def failure_message_for_should_not
-        "#{message} should not have changed, but did change from #{@before.inspect} to #{@after.inspect}"
+        "#{message} should not have changed, but did change from #{@actual_before.inspect} to #{@actual_after.inspect}"
       end
       
-      def by(amount)
-        @amount = amount
+      def by(expected_delta)
+        @expected_delta = expected_delta
         self
       end
       
@@ -71,14 +74,14 @@ MESSAGE
       end      
       
       def to(to)
-        @given_to = true
-        @to = to
+        @eval_after = true
+        @expected_after = to
         self
       end
       
-      def from (from)
-        @given_from = true
-        @from = from
+      def from (before)
+        @eval_before = true
+        @expected_before = before
         self
       end
       
@@ -93,33 +96,36 @@ MESSAGE
       end
 
       def change_expected?
-        @amount != 0
+        @expected_delta != 0
       end
 
       def changed?
-        @before != @after
+        @actual_before != @actual_after
       end
 
       def matches_before?
-        @given_from ? @from == @before : true
+        @eval_before ? expected_matches_actual?(@expected_before, @actual_before) : true
       end
 
       def matches_after?
-        @given_to ? @to == @after : true
+        @eval_after ? expected_matches_actual?(@expected_after, @actual_after) : true
       end
 
-      def matches_amount?
-        @amount ? (@before + @amount == @after) : true
+      def matches_expected_delta?
+        @expected_delta ? (@actual_before + @expected_delta == @actual_after) : true
       end
 
       def matches_min?
-        @minimum ? (@after - @before >= @minimum) : true
+        @minimum ? (@actual_after - @actual_before >= @minimum) : true
       end
 
       def matches_max?
-        @maximum ? (@after - @before <= @maximum) : true
+        @maximum ? (@actual_after - @actual_before <= @maximum) : true
       end
       
+      def expected_matches_actual?(expected, actual)
+        expected === actual
+      end
     end
     
     # :call-seq:
@@ -174,6 +180,15 @@ MESSAGE
     #     employee.develop_great_new_social_networking_app
     #   }.should change(employee, :title).from("Mail Clerk").to("CEO")
     #
+    #   lambda {
+    #     doctor.leave_office
+    #   }.should change(doctor, :sign).from(/is in/).to(/is out/)
+    #
+    #   user = User.new(:type => "admin")
+    #   lambda {
+    #     user.symbolize_type
+    #   }.should change(user, :type).from(String).to(Symbol)
+    #
     # == Notes
     #
     # Evaluates <tt>receiver.message</tt> or <tt>block</tt> before and after it