rspec-expectations 2.0.0.beta.22 → 2.6.0

data/features/{matchers → 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,5 +254,87 @@ 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
+    Given a file named "matcher_with_separate_should_not_logic_spec.rb" with:
+      """
+      RSpec::Matchers.define :contain do |*expected|
+        match_for_should do |actual|
+          expected.all? { |e| actual.include?(e) }
+        end
+
+        match_for_should_not do |actual|
+          expected.none? { |e| actual.include?(e) }
+        end
+      end
+
+      describe [1, 2, 3] do
+        it { should contain(1, 2) }
+        it { should_not contain(4, 5, 6) }
+
+        # deliberate failures
+        it { should contain(1, 4) }
+        it { should_not contain(1, 4) }
+      end
+      """
+    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     |
+      | expected [1, 2, 3] not to contain 1 and 4 |
+
+  Scenario: use define_method to create a helper method with access to matcher params
+    Given a file named "define_method_spec.rb" with:
+      """
+      RSpec::Matchers.define :be_a_multiple_of do |expected|
+        define_method :is_multiple? do |actual|
+          actual % expected == 0
+        end
+        match { |actual| is_multiple?(actual) }
+      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 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     |
+      | expected 9 not to be a multiple of 3 |

data/features/{matchers → 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/{matchers → custom_matchers}/define_matcher_with_fluent_interface.feature

@@ -1,27 +1,24 @@
-Feature: define matcher
+Feature: define matcher with fluent interface
 
-  In order to express my domain clearly in my code examples
-  As an RSpec user
-  I want to define matchers with fluent interfaces
+  Use the chain() method to define matchers with a fluent interface.
   
-  Scenario: one additional method
+  Scenario: chained method with argumetn
     Given a file named "between_spec.rb" with:
       """
       RSpec::Matchers.define :be_bigger_than do |first|
-        def but_smaller_than(second)
-          @second = second
-          self
-        end
-        
         match do |actual|
           (actual > first) && (actual < @second)
         end
+
+        chain :but_smaller_than do |second|
+          @second = second
+        end
       end
 
       describe 5 do
         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

@@ -0,0 +1,22 @@
+Feature: customized message
+
+  RSpec tries to provide useful failure messages, but for cases in which you
+  want more specific information, you can define your own message right in the
+  example. This works for any matcher _other than the operator matchers_.
+  
+  Scenario: customize failure message
+    Given a file named "example_spec.rb" with:
+      """
+      describe Array do
+        context "when created with `new`" do
+          it "is empty" do
+            array = Array.new
+            array << 1 # trigger a failure to demonstrate the message
+            array.should be_empty, "expected empty array, got #{array.inspect}"
+          end
+        end
+      end
+
+      """
+    When I run `rspec example_spec.rb --format documentation`
+    Then the output should contain "expected empty array, got [1]"

data/features/{expectations/diffing.feature → diffing.feature}

@@ -21,15 +21,15 @@ Feature: diffing
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain:
       """
-           Diff:
-           @@ -1,4 +1,4 @@
-            this is the
-           -  expected
-           +  actual
-                string
+             Diff:
+             @@ -1,4 +1,4 @@
+              this is the
+             -  expected
+             +  actual
+                  string
       """
 
   Scenario: diff for a multiline string and a regexp
@@ -47,15 +47,15 @@ Feature: diffing
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain:
       """
-           Diff:
-           @@ -1,2 +1,4 @@
-           -/expected/m
-           +this is the
-           +  actual
-           +    string
+             Diff:
+             @@ -1,2 +1,4 @@
+             -/expected/m
+             +this is the
+             +  actual
+             +    string
       """
 
   Scenario: no diff for a single line strings
@@ -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/{expectations/implicit_docstrings.feature → implicit_docstrings.feature}

@@ -18,13 +18,13 @@ 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"
     And the output should contain "should respond to #size"
 
-  Scenario Outline: run failing examples
+  Scenario: run failing examples
     Given a file named "failing_implicit_docstrings_spec.rb" with:
     """
     describe "Failing examples with no descriptions" do
@@ -44,9 +44,9 @@ 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"
-    And the output should contain "should include "b""
+    And the output should contain "should include 4"
     And the output should contain "should not respond to #size"

data/features/step_definitions/additional_cli_steps.rb

@@ -0,0 +1,22 @@
+# 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| all_output =~ regexp(s) }
+    fail %Q{Neither "#{string1}" or "#{string2}" were found in:\n#{all_output}}
+  end
+end
+
+Then /^the output should contain all of these:$/ do |table|
+  table.raw.flatten.each do |string|
+    assert_partial_output(string)
+  end
+end
+
+Then /^the example(?:s)? should(?: all)? pass$/ do
+  Then %q{the output should contain "0 failures"}
+  Then %q{the exit status should be 0}
+end
+
+Then /^the example should fail$/ do
+  Then %q{the output should contain "1 failure"}
+  Then %q{the exit status should not be 0}
+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

@@ -0,0 +1,46 @@
+Feature: Test::Unit integration
+
+  RSpec-expectations is a stand-alone gem that can be used without
+  the rest of RSpec.  It can easily be used with another test
+  framework such as Test::Unit if you like RSpec's should/should_not
+  syntax but prefer the test organization of another framework.
+
+  Scenario: Basic Test::Unit usage
+    Given a file named "rspec_expectations_test.rb" with:
+      """
+      require 'test/unit'
+      require 'rspec/expectations'
+
+      class RSpecExpectationsTest < Test::Unit::TestCase
+        RSpec::Matchers.define :be_an_integer do
+          match { |actual| Integer === actual }
+        end
+
+        def be_an_int
+          RSpec.deprecate(:be_an_int, :be_an_integer)
+          be_an_integer
+        end
+
+        def test_passing_expectation
+          x = 1 + 3
+          x.should == 4
+        end
+
+        def test_failing_expectation
+          array = [1, 2]
+          array.should be_empty
+        end
+
+        def test_expect_matcher
+          expect { @a = 5 }.to change { @a }.from(nil).to(5)
+        end
+
+        def test_custom_matcher_and_deprecation_warning
+          1.should be_an_int
+        end
+      end
+      """
+     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/deprecation.rb

@@ -0,0 +1,36 @@
+module RSpec
+
+  # This is defined in rspec-core, but we can't assume it's loaded since
+  # rspec-expectations should be usable w/o rspec-core.
+  unless respond_to?(:deprecate)
+    class << self
+      def deprecate(method, alternate_method=nil, version=nil)
+        version_string = version ? "rspec-#{version}" : "a future version of RSpec"
+
+        message = <<-NOTICE
+
+*****************************************************************
+DEPRECATION WARNING: you are using deprecated behaviour that will
+be removed from #{version_string}.
+
+#{caller(0)[2]}
+
+* #{method} is deprecated.
+NOTICE
+      if alternate_method
+        message << <<-ADDITIONAL
+* please use #{alternate_method} instead.
+ADDITIONAL
+      end
+
+        message << "*****************************************************************"
+        warn_deprecation(message)
+      end
+
+      def warn_deprecation(message)
+        send :warn, message
+      end
+    end
+  end
+end
+

data/lib/rspec/expectations/extensions.rb

@@ -1,3 +1,2 @@
 require 'rspec/expectations/extensions/kernel'
 require 'rspec/expectations/extensions/array'
-require 'rspec/expectations/extensions/rspec/core/example_group'

data/lib/rspec/expectations/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Expectations # :nodoc:
     module Version # :nodoc:
-      STRING = '2.0.0.beta.22'
+      STRING = '2.6.0'
     end
   end
 end

data/lib/rspec/expectations.rb

@@ -1,7 +1,8 @@
+require 'rspec/expectations/extensions'
 require 'rspec/matchers'
 require 'rspec/expectations/fail_with'
 require 'rspec/expectations/errors'
-require 'rspec/expectations/extensions'
+require 'rspec/expectations/deprecation'
 require 'rspec/expectations/handler'
 require 'rspec/expectations/version'
 require 'rspec/expectations/backward_compatibility'

data/lib/rspec/matchers/be.rb

@@ -2,7 +2,7 @@ require 'rspec/matchers/dsl'
 
 RSpec::Matchers.define :be_true do
   match do |actual|
-    !!actual
+    actual
   end
 end
 
@@ -18,11 +18,11 @@ RSpec::Matchers.define :be_nil do
   end
 
   failure_message_for_should do |actual|
-    "expected nil, got #{actual.inspect}"
+    "expected: nil\n     got: #{actual.inspect}"
   end
 
   failure_message_for_should_not do
-    "expected not nil, got nil"
+    "expected: not nil\n     got: nil"
   end
 end
 
@@ -96,7 +96,7 @@ module RSpec
       end
 
       def failure_message_for_should
-        "expected #{@operator} #{@expected}, got #{@actual.inspect}"
+        "expected: #{@operator} #{@expected.inspect}\n     got: #{@operator.to_s.gsub(/./, ' ')} #{@actual.inspect}"
       end
       
       def failure_message_for_should_not

data/lib/rspec/matchers/be_close.rb

@@ -10,23 +10,8 @@ module RSpec
     #
     #   result.should be_close(3.0, 0.5)
     def be_close(expected, delta)
-      Matcher.new :be_close, expected, delta do |_expected_, _delta_|
-        match do |actual|
-          (actual - _expected_).abs < _delta_
-        end
-
-        failure_message_for_should do |actual|
-          "expected #{_expected_} +/- (< #{_delta_}), got #{actual}"
-        end
-
-        failure_message_for_should_not do |actual|
-          "expected #{_expected_} +/- (< #{_delta_}), got #{actual}"
-        end
-
-        description do
-          "be close to #{_expected_} (within +- #{_delta_})"
-        end
-      end
+      RSpec.deprecate("be_close(#{expected}, #{delta})", "be_within(#{delta}).of(#{expected})")
+      be_within(delta).of(expected)
     end
   end
 end

data/lib/rspec/matchers/be_within.rb

@@ -0,0 +1,40 @@
+module RSpec
+  module Matchers
+    # :call-seq:
+    #   should be_within(delta).of(expected)
+    #   should_not be_within(delta).of(expected)
+    #
+    # Passes if actual == expected +/- delta
+    #
+    # == Example
+    #
+    #   result.should be_within(0.5).of(3.0)
+    def be_within(delta)
+      Matcher.new :be_within, delta do |_delta_|
+        chain :of do |_expected_|
+          @_expected = _expected_
+        end
+
+        match do |actual|
+          unless @_expected
+            raise ArgumentError.new("You must set an expected value using #of: be_within(#{_delta_}).of(expected_value)")
+          end
+          (actual - @_expected).abs < _delta_
+        end
+
+        failure_message_for_should do |actual|
+          "expected #{actual} to #{description}"
+        end
+
+        failure_message_for_should_not do |actual|
+          "expected #{actual} not to #{description}"
+        end
+
+        description do
+          "be within #{_delta_} of #{@_expected}"
+        end
+      end
+    end
+  end
+end
+

data/lib/rspec/matchers/block_aliases.rb

@@ -0,0 +1,19 @@
+module RSpec
+  module Matchers
+    module BlockAliases
+      alias_method :to,     :should
+      alias_method :to_not, :should_not
+      alias_method :not_to, :should_not
+    end
+
+    # Extends the submitted block with aliases to and to_not
+    # for should and should_not. Allows expectations like this:
+    #
+    #   expect { this_block }.to change{this.expression}.from(old_value).to(new_value)
+    #   expect { this_block }.to raise_error
+    def expect(&block)
+      block.extend BlockAliases
+    end
+  end
+end
+