rspec-expectations 2.3.0 → 2.4.0

data/features/{matchers → built_in_matchers}/predicates.feature

@@ -1,4 +1,4 @@
-Feature: Predicate matchers
+Feature: predicate matchers
 
   Ruby objects commonly provide predicate methods:
 

data/features/{matchers → built_in_matchers}/satisfy.feature

@@ -1,4 +1,4 @@
-Feature: Satisfy matcher
+Feature: satisfy matcher
 
   The satisfy matcher is extremely flexible and can handle almost anything
   you want to specify.  It passes if the block you provide returns true:

data/features/{matchers → built_in_matchers}/throw_symbol.feature

@@ -1,4 +1,4 @@
-Feature: Throw symbol matcher
+Feature: throw_symbol matcher
 
   The throw_symbol matcher is used to specify that a block of code
   throws a symbol.  The most basic form passes if any symbol is thrown:

data/features/{matchers → custom_matchers}/access_running_example.feature

@@ -1,4 +1,4 @@
-Feature: Access running example
+Feature: access running example
 
   In order to take advantage of services that are available
     in my examples when I'm writing matchers

data/features/{matchers → custom_matchers}/define_diffable_matcher.feature

@@ -1,4 +1,4 @@
-Feature: Define diffable matcher
+Feature: define diffable matcher
 
   When a matcher is defined as diffable, and the --diff
   flag is set, the output will include a diff of the submitted

data/features/{matchers → custom_matchers}/define_matcher.feature

@@ -1,4 +1,4 @@
-Feature: Define matcher
+Feature: define matcher
 
   In order to express my domain clearly in my code examples
   As an RSpec user

data/features/{matchers → custom_matchers}/define_matcher_outside_rspec.feature

@@ -1,4 +1,4 @@
-Feature: Define matcher outside rspec
+Feature: define matcher outside rspec
 
   In order to express my domain clearly in my code examples
   As a non-rspec user

data/features/{matchers → custom_matchers}/define_matcher_with_fluent_interface.feature

@@ -1,4 +1,4 @@
-Feature: Define matcher with fluent interface
+Feature: define matcher with fluent interface
 
   Use the chain() method to define matchers with a fluent interface.
   

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

@@ -24,12 +24,12 @@ Feature: diffing
     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
@@ -50,12 +50,12 @@ Feature: diffing
     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

data/lib/rspec/expectations/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Expectations # :nodoc:
     module Version # :nodoc:
-      STRING = '2.3.0'
+      STRING = '2.4.0'
     end
   end
 end

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/change.rb

@@ -123,12 +123,25 @@ MESSAGE
     end
     
     # :call-seq:
-    #   should change(receiver, message, &block)
-    #   should change(receiver, message, &block).by(value)
-    #   should change(receiver, message, &block).from(old).to(new)
-    #   should_not change(receiver, message, &block)
+    #   should change(receiver, message)
+    #   should change(receiver, message).by(value)
+    #   should change(receiver, message).from(old).to(new)
+    #   should_not change(receiver, message)
     #
-    # Allows you to specify that a Proc will cause some value to change.
+    #   should change {...}
+    #   should change {...}.by(value)
+    #   should change {...}.from(old).to(new)
+    #   should_not change {...}
+    #
+    # Applied to a proc, specifies that its execution will cause some value to
+    # change.
+    #
+    # You can either pass <tt>receiver</tt> and <tt>message</tt>, or a block,
+    # but not both.
+    #
+    # When passing a block, it must use the <tt>{ ... }</tt> format, not
+    # do/end, as <tt>{ ... }</tt> binds to the +change+ method, whereas do/end
+    # would errantly bind to the +should+ or +should_not+ method.
     #
     # == Examples
     #
@@ -161,22 +174,15 @@ MESSAGE
     #     employee.develop_great_new_social_networking_app
     #   }.should change(employee, :title).from("Mail Clerk").to("CEO")
     #
-    # Evaluates <tt>receiver.message</tt> or <tt>block</tt> before and after
-    # it evaluates the c object (generated by the lambdas in the examples
-    # above).
+    # == Notes
     #
-    # Then compares the values before and after the <tt>receiver.message</tt>
-    # and evaluates the difference compared to the expected difference.
-    #
-    # == WARNING
-    # <tt>should_not change</tt> only supports the form with no
-    # subsequent calls to <tt>by</tt>, <tt>by_at_least</tt>,
-    # <tt>by_at_most</tt>, <tt>to</tt> or <tt>from</tt>.
-    #
-    # blocks passed to <tt>should</tt> <tt>change</tt> and <tt>should_not</tt>
-    # <tt>change</tt> must use the <tt>{}</tt> form (<tt>do/end</tt> is not
-    # supported).
+    # Evaluates <tt>receiver.message</tt> or <tt>block</tt> before and after it
+    # evaluates the proc object (generated by the lambdas in the examples
+    # above).
     #
+    # <tt>should_not change</tt> only supports the form with no subsequent
+    # calls to <tt>by</tt>, <tt>by_at_least</tt>, <tt>by_at_most</tt>,
+    # <tt>to</tt> or <tt>from</tt>.
     def change(receiver=nil, message=nil, &block)
       Matchers::Change.new(receiver, message, &block)
     end

data/lib/rspec/matchers/operator_matcher.rb

@@ -67,9 +67,9 @@ module RSpec
         if actual.__send__(operator, expected)
           true
         elsif ['==','===', '=~'].include?(operator)
-          fail_with_message("expected: #{expected.inspect},\n     got: #{actual.inspect} (using #{operator})") 
+          fail_with_message("expected: #{expected.inspect}\n     got: #{actual.inspect} (using #{operator})") 
         else
-          fail_with_message("expected: #{operator} #{expected.inspect},\n     got: #{operator.gsub(/./, ' ')} #{actual.inspect}")
+          fail_with_message("expected: #{operator} #{expected.inspect}\n     got: #{operator.gsub(/./, ' ')} #{actual.inspect}")
         end
       end
 
@@ -78,7 +78,7 @@ module RSpec
     class NegativeOperatorMatcher < OperatorMatcher #:nodoc:
       def __delegate_operator(actual, operator, expected)
         return false unless actual.__send__(operator, expected)
-        return fail_with_message("expected not: #{operator} #{expected.inspect},\n         got: #{operator.gsub(/./, ' ')} #{actual.inspect}")
+        return fail_with_message("expected not: #{operator} #{expected.inspect}\n         got: #{operator.gsub(/./, ' ')} #{actual.inspect}")
       end
 
     end

data/spec/rspec/matchers/be_spec.rb

@@ -269,7 +269,7 @@ describe "should be_nil" do
   it "fails when actual is not nil" do
     lambda {
       :not_nil.should be_nil
-    }.should fail_with("expected nil, got :not_nil")
+    }.should fail_with(/^expected: nil/)
   end
 end
 
@@ -281,7 +281,7 @@ describe "should_not be_nil" do
   it "fails when actual is nil" do
     lambda {
       nil.should_not be_nil
-    }.should fail_with("expected not nil, got nil")
+    }.should fail_with(/^expected: not nil/)
   end
 end
 
@@ -291,7 +291,7 @@ describe "should be <" do
   end
 
   it "fails when < operator returns false" do
-    lambda { 3.should be < 3 }.should fail_with("expected < 3, got 3")
+    lambda { 3.should be < 3 }.should fail_with("expected: < 3\n     got:   3")
   end
 
   it "describes itself" do
@@ -306,7 +306,7 @@ describe "should be <=" do
   end
 
   it "fails when <= operator returns false" do
-    lambda { 3.should be <= 2 }.should fail_with("expected <= 2, got 3")
+    lambda { 3.should be <= 2 }.should fail_with("expected: <= 2\n     got:    3")
   end
 end
 
@@ -317,7 +317,7 @@ describe "should be >=" do
   end
 
   it "fails when >= operator returns false" do
-    lambda { 3.should be >= 4 }.should fail_with("expected >= 4, got 3")
+    lambda { 3.should be >= 4 }.should fail_with("expected: >= 4\n     got:    3")
   end
 end
 
@@ -327,7 +327,7 @@ describe "should be >" do
   end
 
   it "fails when > operator returns false" do
-    lambda { 3.should be > 4 }.should fail_with("expected > 4, got 3")
+    lambda { 3.should be > 4 }.should fail_with("expected: > 4\n     got:   3")
   end
 end
 
@@ -337,7 +337,7 @@ describe "should be ==" do
   end
 
   it "fails when == operator returns false" do
-    lambda { 3.should be == 4 }.should fail_with("expected == 4, got 3")
+    lambda { 3.should be == 4 }.should fail_with("expected: == 4\n     got:    3")
   end
 end
 
@@ -347,7 +347,7 @@ describe "should be ===" do
   end
 
   it "fails when === operator returns false" do
-    lambda { Hash.should be === "not a hash" }.should fail_with(%[expected === not a hash, got Hash])
+    lambda { Hash.should be === "not a hash" }.should fail_with(%[expected: === "not a hash"\n     got:     Hash])
   end
 end
 

data/spec/rspec/matchers/operator_matcher_spec.rb

@@ -15,7 +15,7 @@ describe "should ==" do
   
   it "fails when target.==(actual) returns false" do
     subject = "apple"
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n     got: "apple" (using ==)], "orange", "apple")
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: "orange"\n     got: "apple" (using ==)], "orange", "apple")
     subject.should == "orange"
   end
   
@@ -62,7 +62,7 @@ describe "should_not ==" do
 
   it "fails when target.==(actual) returns false" do
     subject = "apple"
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected not: == "apple",\n         got:    "apple"], "apple", "apple")
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected not: == "apple"\n         got:    "apple"], "apple", "apple")
     subject.should_not == "apple"
   end
   
@@ -79,7 +79,7 @@ describe "should ===" do
   it "fails when target.===(actual) returns false" do
     subject = "apple"
     subject.should_receive(:===).with("orange").and_return(false)
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n     got: "apple" (using ===)], "orange", "apple")
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: "orange"\n     got: "apple" (using ===)], "orange", "apple")
     subject.should === "orange"
   end
   
@@ -96,7 +96,7 @@ describe "should_not ===" do
   it "fails when target.===(actual) returns false" do
     subject = "apple"
     subject.should_receive(:===).with("apple").and_return(true)
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected not: === "apple",\n         got:     "apple"], "apple", "apple")
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected not: === "apple"\n         got:     "apple"], "apple", "apple")
     subject.should_not === "apple"
   end
 
@@ -113,7 +113,7 @@ describe "should =~" do
   it "fails when target.=~(actual) returns false" do
     subject = "fu"
     subject.should_receive(:=~).with(/oo/).and_return(false)
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected: /oo/,\n     got: "fu" (using =~)], /oo/, "fu")
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: /oo/\n     got: "fu" (using =~)], /oo/, "fu")
     subject.should =~ /oo/
   end
 
@@ -130,7 +130,7 @@ describe "should_not =~" do
   it "fails when target.=~(actual) returns false" do
     subject = "foo"
     subject.should_receive(:=~).with(/oo/).and_return(true)
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected not: =~ /oo/,\n         got:    "foo"], /oo/, "foo")
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected not: =~ /oo/\n         got:    "foo"], /oo/, "foo")
     subject.should_not =~ /oo/
   end
 
@@ -143,7 +143,7 @@ describe "should >" do
   end
 
   it "fails if > fails" do
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected: > 5,\n     got:   4], 5, 4)
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: > 5\n     got:   4], 5, 4)
     4.should > 5
   end
 
@@ -157,7 +157,7 @@ describe "should >=" do
   end
 
   it "fails if > fails" do
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected: >= 5,\n     got:    4], 5, 4)
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: >= 5\n     got:    4], 5, 4)
     4.should >= 5
   end
 
@@ -170,7 +170,7 @@ describe "should <" do
   end
 
   it "fails if > fails" do
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected: < 3,\n     got:   4], 3, 4)
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: < 3\n     got:   4], 3, 4)
     4.should < 3
   end
 
@@ -184,7 +184,7 @@ describe "should <=" do
   end
 
   it "fails if > fails" do
-    RSpec::Expectations.should_receive(:fail_with).with(%[expected: <= 3,\n     got:    4], 3, 4)
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: <= 3\n     got:    4], 3, 4)
     4.should <= 3
   end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-expectations
 version: !ruby/object:Gem::Version 
-  hash: 3
   prerelease: false
   segments: 
   - 2
-  - 3
+  - 4
   - 0
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -16,23 +15,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 -06:00
+date: 2011-01-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: diff-lcs
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 1
         - 2
         version: 1.1.2
   type: :runtime
-  name: diff-lcs
   prerelease: false
   version_requirements: *id001
 description: rspec expectations (should[_not] and matchers)
@@ -47,37 +45,38 @@ files:
 - .document
 - .gitignore
 - Gemfile
+- Guardfile
 - History.markdown
 - License.txt
 - README.md
 - Rakefile
 - Upgrade.markdown
 - cucumber.yml
+- features/.nav
 - features/README.markdown
-- features/expectations/attribute_of_subject.feature
-- features/expectations/customized_message.feature
-- features/expectations/diffing.feature
-- features/expectations/implicit_docstrings.feature
-- features/matchers/access_running_example.feature
-- features/matchers/be.feature
-- features/matchers/be_within.feature
-- features/matchers/define_diffable_matcher.feature
-- features/matchers/define_matcher.feature
-- features/matchers/define_matcher_outside_rspec.feature
-- features/matchers/define_matcher_with_fluent_interface.feature
-- features/matchers/equality.feature
-- features/matchers/exist.feature
-- features/matchers/expect_change.feature
-- features/matchers/expect_error.feature
-- features/matchers/have.feature
-- features/matchers/include.feature
-- features/matchers/match.feature
-- features/matchers/operators.feature
-- features/matchers/predicates.feature
-- features/matchers/respond_to.feature
-- features/matchers/satisfy.feature
-- features/matchers/throw_symbol.feature
-- features/matchers/types.feature
+- features/built_in_matchers/be.feature
+- features/built_in_matchers/be_within.feature
+- features/built_in_matchers/equality.feature
+- features/built_in_matchers/exist.feature
+- features/built_in_matchers/expect_change.feature
+- features/built_in_matchers/expect_error.feature
+- features/built_in_matchers/have.feature
+- features/built_in_matchers/include.feature
+- features/built_in_matchers/match.feature
+- features/built_in_matchers/operators.feature
+- features/built_in_matchers/predicates.feature
+- features/built_in_matchers/respond_to.feature
+- features/built_in_matchers/satisfy.feature
+- features/built_in_matchers/throw_symbol.feature
+- features/built_in_matchers/types.feature
+- features/custom_matchers/access_running_example.feature
+- features/custom_matchers/define_diffable_matcher.feature
+- features/custom_matchers/define_matcher.feature
+- features/custom_matchers/define_matcher_outside_rspec.feature
+- features/custom_matchers/define_matcher_with_fluent_interface.feature
+- features/customized_message.feature
+- features/diffing.feature
+- features/implicit_docstrings.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
 - features/test_frameworks/test_unit.feature
@@ -173,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2554060302736803438
       segments: 
       - 0
       version: "0"
@@ -182,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2554060302736803438
       segments: 
       - 0
       version: "0"
@@ -192,33 +191,32 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.3.0
+summary: rspec-expectations-2.4.0
 test_files: 
 - features/README.markdown
-- features/expectations/attribute_of_subject.feature
-- features/expectations/customized_message.feature
-- features/expectations/diffing.feature
-- features/expectations/implicit_docstrings.feature
-- features/matchers/access_running_example.feature
-- features/matchers/be.feature
-- features/matchers/be_within.feature
-- features/matchers/define_diffable_matcher.feature
-- features/matchers/define_matcher.feature
-- features/matchers/define_matcher_outside_rspec.feature
-- features/matchers/define_matcher_with_fluent_interface.feature
-- features/matchers/equality.feature
-- features/matchers/exist.feature
-- features/matchers/expect_change.feature
-- features/matchers/expect_error.feature
-- features/matchers/have.feature
-- features/matchers/include.feature
-- features/matchers/match.feature
-- features/matchers/operators.feature
-- features/matchers/predicates.feature
-- features/matchers/respond_to.feature
-- features/matchers/satisfy.feature
-- features/matchers/throw_symbol.feature
-- features/matchers/types.feature
+- features/built_in_matchers/be.feature
+- features/built_in_matchers/be_within.feature
+- features/built_in_matchers/equality.feature
+- features/built_in_matchers/exist.feature
+- features/built_in_matchers/expect_change.feature
+- features/built_in_matchers/expect_error.feature
+- features/built_in_matchers/have.feature
+- features/built_in_matchers/include.feature
+- features/built_in_matchers/match.feature
+- features/built_in_matchers/operators.feature
+- features/built_in_matchers/predicates.feature
+- features/built_in_matchers/respond_to.feature
+- features/built_in_matchers/satisfy.feature
+- features/built_in_matchers/throw_symbol.feature
+- features/built_in_matchers/types.feature
+- features/custom_matchers/access_running_example.feature
+- features/custom_matchers/define_diffable_matcher.feature
+- features/custom_matchers/define_matcher.feature
+- features/custom_matchers/define_matcher_outside_rspec.feature
+- features/custom_matchers/define_matcher_with_fluent_interface.feature
+- features/customized_message.feature
+- features/diffing.feature
+- features/implicit_docstrings.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
 - features/test_frameworks/test_unit.feature