rspec 1.2.9 → 1.3.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 -05:00
+date: 2010-01-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,14 +23,14 @@ dependencies:
         version: "0.3"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: bmabey-fakefs
+  name: fakefs
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: syntax
@@ -155,6 +155,8 @@ files:
 - features/expectations/expect_error.feature
 - features/extensions/custom_example_group.feature
 - features/formatters/custom_formatter.feature
+- features/formatters/nested_formatter.feature
+- features/interop/cucumber_stubs_dont_leak.feature
 - features/interop/examples_and_tests_together.feature
 - features/interop/rspec_output.feature
 - features/interop/test_but_not_test_unit.feature
@@ -166,19 +168,24 @@ files:
 - features/matchers/define_matcher_outside_rspec.feature
 - features/matchers/define_matcher_with_fluent_interface.feature
 - features/matchers/define_wrapped_matcher.feature
+- features/matchers/match_unless_raises.feature
+- features/matchers/match_unless_raises_unexpected_error.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
 - features/mock_framework_integration/use_rr.feature
+- features/mocks/block_local_expectations.feature
 - features/mocks/mix_stubs_and_mocks.feature
 - features/mocks/stub_implementation.feature
 - features/pending/pending_examples.feature
 - features/runner/specify_line_number.feature
 - features/spec_helper/spec_helper.feature
 - features/step_definitions/running_rspec_steps.rb
+- features/step_definitions/stubbing_steps.rb
 - features/subject/explicit_subject.feature
 - features/subject/implicit_subject.feature
 - features/support/env.rb
 - features/support/matchers/smart_match.rb
+- geminstaller.yml
 - init.rb
 - lib/autotest/discover.rb
 - lib/autotest/rspec.rb
@@ -214,6 +221,7 @@ files:
 - lib/spec/expectations/extensions/kernel.rb
 - lib/spec/expectations/fail_with.rb
 - lib/spec/expectations/handler.rb
+- lib/spec/extensions/instance_exec.rb
 - lib/spec/interop/test.rb
 - lib/spec/interop/test/unit/autorunner.rb
 - lib/spec/interop/test/unit/testcase.rb
@@ -232,7 +240,6 @@ files:
 - lib/spec/matchers/equal.rb
 - lib/spec/matchers/errors.rb
 - lib/spec/matchers/exist.rb
-- lib/spec/matchers/extensions/instance_exec.rb
 - lib/spec/matchers/generated_descriptions.rb
 - lib/spec/matchers/has.rb
 - lib/spec/matchers/have.rb
@@ -243,7 +250,7 @@ files:
 - lib/spec/matchers/method_missing.rb
 - lib/spec/matchers/operator_matcher.rb
 - lib/spec/matchers/pretty.rb
-- lib/spec/matchers/raise_error.rb
+- lib/spec/matchers/raise_exception.rb
 - lib/spec/matchers/respond_to.rb
 - lib/spec/matchers/satisfy.rb
 - lib/spec/matchers/simple_matcher.rb
@@ -362,15 +369,15 @@ files:
 - spec/spec/matchers/include_spec.rb
 - spec/spec/matchers/match_array_spec.rb
 - spec/spec/matchers/match_spec.rb
-- spec/spec/matchers/matcher_methods_spec.rb
 - spec/spec/matchers/matcher_spec.rb
 - spec/spec/matchers/matchers_spec.rb
 - spec/spec/matchers/operator_matcher_spec.rb
-- spec/spec/matchers/raise_error_spec.rb
+- spec/spec/matchers/raise_exception_spec.rb
 - spec/spec/matchers/respond_to_spec.rb
 - spec/spec/matchers/satisfy_spec.rb
 - spec/spec/matchers/simple_matcher_spec.rb
 - spec/spec/matchers/throw_symbol_spec.rb
+- spec/spec/mocks/and_yield_spec.rb
 - spec/spec/mocks/any_number_of_times_spec.rb
 - spec/spec/mocks/argument_expectation_spec.rb
 - spec/spec/mocks/argument_matchers_spec.rb
@@ -470,7 +477,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-1.2.9
+    Thank you for installing rspec-1.3.0
   
     Please be sure to read History.rdoc and Upgrade.rdoc
     for useful information about this release.
@@ -500,6 +507,6 @@ rubyforge_project: rspec
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: rspec 1.2.9
+summary: rspec 1.3.0
 test_files: []
 

data/lib/spec/matchers/raise_error.rb

@@ -1,129 +0,0 @@
-module Spec
-  module Matchers
-    class RaiseError #:nodoc:
-      def initialize(expected_error_or_message=Exception, expected_message=nil, &block)
-        @block = block
-        @actual_error = nil
-        case expected_error_or_message
-        when String, Regexp
-          @expected_error, @expected_message = Exception, expected_error_or_message
-        else
-          @expected_error, @expected_message = expected_error_or_message, expected_message
-        end
-      end
-
-      def matches?(given_proc)
-        @raised_expected_error = false
-        @with_expected_message = false
-        @eval_block = false
-        @eval_block_passed = false
-        begin
-          given_proc.call
-        rescue @expected_error => @actual_error
-          @raised_expected_error = true
-          @with_expected_message = verify_message
-        rescue Exception => @actual_error
-          # This clause should be empty, but rcov will not report it as covered
-          # unless something (anything) is executed within the clause
-          rcov_error_report = "http://eigenclass.org/hiki.rb?rcov-0.8.0"
-        end
-
-        unless negative_expectation?
-          eval_block if @raised_expected_error && @with_expected_message && @block
-        end
-      ensure
-        return (@raised_expected_error & @with_expected_message) ? (@eval_block ? @eval_block_passed : true) : false
-      end
-      
-      def eval_block
-        @eval_block = true
-        begin
-          @block[@actual_error]
-          @eval_block_passed = true
-        rescue Exception => err
-          @actual_error = err
-        end
-      end
-
-      def verify_message
-        case @expected_message
-        when nil
-          true
-        when Regexp
-          @expected_message =~ @actual_error.message
-        else
-          @expected_message == @actual_error.message
-        end
-      end
-      
-      def failure_message_for_should
-        @eval_block ? @actual_error.message : "expected #{expected_error}#{given_error}"
-      end
-
-      def failure_message_for_should_not
-        "expected no #{expected_error}#{given_error}"
-      end
-      
-      def description
-        "raise #{expected_error}"
-      end
-      
-      private
-        def expected_error
-          case @expected_message
-          when nil
-            @expected_error
-          when Regexp
-            "#{@expected_error} with message matching #{@expected_message.inspect}"
-          else
-            "#{@expected_error} with #{@expected_message.inspect}"
-          end
-        end
-
-        def given_error
-          @actual_error.nil? ? " but nothing was raised" : ", got #{@actual_error.inspect}"
-        end
-        
-        def negative_expectation?
-          # YES - I'm a bad person... help me find a better way - ryand
-          caller.first(3).find { |s| s =~ /should_not/ }
-        end
-    end
-    
-    # :call-seq:
-    #   should raise_error()
-    #   should raise_error(NamedError)
-    #   should raise_error(NamedError, String)
-    #   should raise_error(NamedError, Regexp)
-    #   should raise_error() { |error| ... }
-    #   should raise_error(NamedError) { |error| ... }
-    #   should raise_error(NamedError, String) { |error| ... }
-    #   should raise_error(NamedError, Regexp) { |error| ... }
-    #   should_not raise_error()
-    #   should_not raise_error(NamedError)
-    #   should_not raise_error(NamedError, String)
-    #   should_not raise_error(NamedError, Regexp)
-    #
-    # With no args, matches if any error is raised.
-    # With a named error, matches only if that specific error is raised.
-    # With a named error and messsage specified as a String, matches only if both match.
-    # With a named error and messsage specified as a Regexp, matches only if both match.
-    # Pass an optional block to perform extra verifications on the exception matched
-    #
-    # == Examples
-    #
-    #   lambda { do_something_risky }.should raise_error
-    #   lambda { do_something_risky }.should raise_error(PoorRiskDecisionError)
-    #   lambda { do_something_risky }.should raise_error(PoorRiskDecisionError) { |error| error.data.should == 42 }
-    #   lambda { do_something_risky }.should raise_error(PoorRiskDecisionError, "that was too risky")
-    #   lambda { do_something_risky }.should raise_error(PoorRiskDecisionError, /oo ri/)
-    #
-    #   lambda { do_something_risky }.should_not raise_error
-    #   lambda { do_something_risky }.should_not raise_error(PoorRiskDecisionError)
-    #   lambda { do_something_risky }.should_not raise_error(PoorRiskDecisionError, "that was too risky")
-    #   lambda { do_something_risky }.should_not raise_error(PoorRiskDecisionError, /oo ri/)
-    def raise_error(error=Exception, message=nil, &block)
-      Matchers::RaiseError.new(error, message, &block)
-    end
-  end
-end

data/spec/spec/matchers/matcher_methods_spec.rb

@@ -1,63 +0,0 @@
-require 'spec_helper'
-
-module Spec
-  module Matchers
-    context %Q{The Spec::Matchers module gets included in the execution context of every spec.
-This module should provide the following methods, each of which returns a Matcher object.} do
-      it "be_true" do
-        be_true.should be_an_instance_of(Be)
-      end
-      it "be_false" do
-        be_false.should be_an_instance_of(Be)
-      end
-      it "be_nil" do
-        be_nil.should be_an_instance_of(Be)
-      end
-      it "be_arbitrary_predicate" do
-        be_arbitrary_predicate.should be_an_instance_of(Be)
-      end
-      it "change" do
-        change("target", :message).should be_an_instance_of(Change)
-      end
-      it "have" do
-        have(0).should be_an_instance_of(Have)
-      end
-      it "have_exactly" do
-        have_exactly(0).should be_an_instance_of(Have)
-      end
-      it "have_at_least" do
-        have_at_least(0).should be_an_instance_of(Have)
-      end
-      it "have_at_most" do
-        have_at_most(0).should be_an_instance_of(Have)
-      end
-      it "raise_error" do
-        raise_error.should be_an_instance_of(RaiseError)
-        raise_error(NoMethodError).should be_an_instance_of(RaiseError)
-        raise_error(NoMethodError, "message").should be_an_instance_of(RaiseError)
-      end
-      it "satisfy" do
-        satisfy{}.should be_an_instance_of(Satisfy)
-      end
-      it "throw_symbol" do
-        throw_symbol.should be_an_instance_of(ThrowSymbol)
-        throw_symbol(:sym).should be_an_instance_of(ThrowSymbol)
-      end
-      it "respond_to" do
-        respond_to(:sym).should be_an_instance_of(RespondTo)
-      end
-    end
-    
-    describe "Spec::Matchers#method_missing" do
-      it "should convert be_xyz to Be(:be_xyz)" do
-        Be.should_receive(:new).with(:be_whatever)
-        be_whatever
-      end
-
-      it "should convert have_xyz to Has(:have_xyz)" do
-        Has.should_receive(:new).with(:have_whatever)
-        have_whatever
-      end
-    end
-  end
-end

data/spec/spec/matchers/raise_error_spec.rb

@@ -1,333 +0,0 @@
-require 'spec_helper'
-
-describe "should raise_error" do
-  it "should pass if anything is raised" do
-    lambda {raise}.should raise_error
-  end
-  
-  it "should fail if nothing is raised" do
-    lambda {
-      lambda {}.should raise_error
-    }.should fail_with("expected Exception but nothing was raised")
-  end
-end
-
-describe "should raise_error {|err| ... }" do
-  it "passes if there is an error" do
-    ran = false
-    lambda { non_existent_method }.should raise_error {|e|
-      ran = true
-    }
-    ran.should be_true
-  end
-
-  it "passes the error to the block" do
-    error = nil
-    lambda { non_existent_method }.should raise_error {|e|
-      error = e
-    }
-    error.should be_kind_of(NameError)
-  end
-end
-
-describe "should_not raise_error" do
-  it "should pass if nothing is raised" do
-    lambda {}.should_not raise_error
-  end
-  
-  it "should fail if anything is raised" do
-    lambda {
-      lambda {raise}.should_not raise_error
-    }.should fail_with("expected no Exception, got RuntimeError")
-  end
-end
-
-describe "should raise_error(message)" do
-  it "should pass if RuntimeError is raised with the right message" do
-    lambda {raise 'blah'}.should raise_error('blah')
-  end
-  it "should pass if RuntimeError is raised with a matching message" do
-    lambda {raise 'blah'}.should raise_error(/blah/)
-  end
-  it "should pass if any other error is raised with the right message" do
-    lambda {raise NameError.new('blah')}.should raise_error('blah')
-  end
-  it "should fail if RuntimeError error is raised with the wrong message" do
-    lambda do
-      lambda {raise 'blarg'}.should raise_error('blah')
-    end.should fail_with("expected Exception with \"blah\", got #<RuntimeError: blarg>")
-  end
-  it "should fail if any other error is raised with the wrong message" do
-    lambda do
-      lambda {raise NameError.new('blarg')}.should raise_error('blah')
-    end.should fail_with("expected Exception with \"blah\", got #<NameError: blarg>")
-  end
-end
-
-describe "should_not raise_error(message)" do
-  it "should pass if RuntimeError error is raised with the different message" do
-    lambda {raise 'blarg'}.should_not raise_error('blah')
-  end
-  it "should pass if any other error is raised with the wrong message" do
-    lambda {raise NameError.new('blarg')}.should_not raise_error('blah')
-  end
-  it "should fail if RuntimeError is raised with message" do
-    lambda do
-      lambda {raise 'blah'}.should_not raise_error('blah')
-    end.should fail_with(%Q|expected no Exception with "blah", got #<RuntimeError: blah>|)
-  end
-  it "should fail if any other error is raised with message" do
-    lambda do
-      lambda {raise NameError.new('blah')}.should_not raise_error('blah')
-    end.should fail_with(%Q|expected no Exception with "blah", got #<NameError: blah>|)
-  end
-end
-
-describe "should raise_error(NamedError)" do
-  it "should pass if named error is raised" do
-    lambda { non_existent_method }.should raise_error(NameError)
-  end
-  
-  it "should fail if nothing is raised" do
-    lambda {
-      lambda { }.should raise_error(NameError)
-    }.should fail_with("expected NameError but nothing was raised")
-  end
-  
-  it "should fail if another error is raised (NameError)" do
-    lambda {
-      lambda { raise }.should raise_error(NameError)
-    }.should fail_with("expected NameError, got RuntimeError")
-  end
-  
-  it "should fail if another error is raised (NameError)" do
-    lambda {
-      lambda { load "non/existent/file" }.should raise_error(NameError)
-    }.should fail_with(/expected NameError, got #<LoadError/)
-  end
-end
-
-describe "should_not raise_error(NamedError)" do
-  it "should pass if nothing is raised" do
-    lambda { }.should_not raise_error(NameError)
-  end
-  
-  it "should pass if another error is raised" do
-    lambda { raise }.should_not raise_error(NameError)
-  end
-  
-  it "should fail if named error is raised" do
-    lambda {
-      lambda { 1 + 'b' }.should_not raise_error(TypeError)
-    }.should fail_with(/expected no TypeError, got #<TypeError: String can't be/)
-  end  
-end
-
-describe "should raise_error(NamedError, error_message) with String" do
-  it "should pass if named error is raised with same message" do
-    lambda { raise "example message" }.should raise_error(RuntimeError, "example message")
-  end
-  
-  it "should fail if nothing is raised" do
-    lambda {
-      lambda {}.should raise_error(RuntimeError, "example message")
-    }.should fail_with("expected RuntimeError with \"example message\" but nothing was raised")
-  end
-  
-  it "should fail if incorrect error is raised" do
-    lambda {
-      lambda { raise }.should raise_error(NameError, "example message")
-    }.should fail_with("expected NameError with \"example message\", got RuntimeError")
-  end
-  
-  it "should fail if correct error is raised with incorrect message" do
-    lambda {
-      lambda { raise RuntimeError.new("not the example message") }.should raise_error(RuntimeError, "example message")
-    }.should fail_with(/expected RuntimeError with \"example message\", got #<RuntimeError: not the example message/)
-  end
-end
-
-describe "should raise_error(NamedError, error_message) { |err| ... }" do
-  it "should yield exception if named error is raised with same message" do
-    ran = false
-
-    lambda {
-      raise "example message"
-    }.should raise_error(RuntimeError, "example message") { |err|
-      ran = true
-      err.class.should == RuntimeError
-      err.message.should == "example message"
-    }
-
-    ran.should == true
-  end
-
-  it "yielded block should be able to fail on it's own right" do
-    ran, passed = false, false
-
-    lambda {
-      lambda {
-        raise "example message"
-      }.should raise_error(RuntimeError, "example message") { |err|
-        ran = true
-        5.should == 4
-        passed = true
-      }
-    }.should fail_with(/expected: 4/m)
-
-    ran.should == true
-    passed.should == false
-  end
-
-  it "should NOT yield exception if no error was thrown" do
-    ran = false
-
-    lambda {
-      lambda {}.should raise_error(RuntimeError, "example message") { |err|
-        ran = true
-      }
-    }.should fail_with("expected RuntimeError with \"example message\" but nothing was raised")
-
-    ran.should == false
-  end
-
-  it "should not yield exception if error class is not matched" do
-    ran = false
-
-    lambda {
-      lambda {
-        raise "example message"
-      }.should raise_error(SyntaxError, "example message") { |err|
-        ran = true
-      }
-    }.should fail_with("expected SyntaxError with \"example message\", got #<RuntimeError: example message>")
-
-    ran.should == false
-  end
-
-  it "should NOT yield exception if error message is not matched" do
-    ran = false
-
-    lambda {
-      lambda {
-        raise "example message"
-      }.should raise_error(RuntimeError, "different message") { |err|
-        ran = true
-      }
-    }.should fail_with("expected RuntimeError with \"different message\", got #<RuntimeError: example message>")
-
-    ran.should == false
-  end
-end
-
-describe "should_not raise_error(NamedError, error_message) { |err| ... }" do
-  it "should pass if nothing is raised" do
-    ran = false
-
-    lambda {}.should_not raise_error(RuntimeError, "example message") { |err|
-      ran = true
-    }
-
-    ran.should == false
-  end
-
-  it "should pass if a different error is raised" do
-    ran = false
-
-    lambda { raise }.should_not raise_error(NameError, "example message") { |err|
-      ran = true
-    }
-
-    ran.should == false
-  end
-
-  it "should pass if same error is raised with different message" do
-    ran = false
-
-    lambda {
-      raise RuntimeError.new("not the example message")
-    }.should_not raise_error(RuntimeError, "example message") { |err|
-      ran = true
-    }
-
-    ran.should == false
-  end
-
-  it "should fail if named error is raised with same message" do
-    ran = false
-
-    lambda {
-      lambda {
-        raise "example message"
-      }.should_not raise_error(RuntimeError, "example message") { |err|
-        ran = true
-      }
-    }.should fail_with("expected no RuntimeError with \"example message\", got #<RuntimeError: example message>")
-
-    ran.should == false
-  end
-end
-
-describe "should_not raise_error(NamedError, error_message) with String" do
-  it "should pass if nothing is raised" do
-    lambda {}.should_not raise_error(RuntimeError, "example message")
-  end
-  
-  it "should pass if a different error is raised" do
-    lambda { raise }.should_not raise_error(NameError, "example message")
-  end
-  
-  it "should pass if same error is raised with different message" do
-    lambda { raise RuntimeError.new("not the example message") }.should_not raise_error(RuntimeError, "example message")
-  end
-  
-  it "should fail if named error is raised with same message" do
-    lambda {
-      lambda { raise "example message" }.should_not raise_error(RuntimeError, "example message")
-    }.should fail_with("expected no RuntimeError with \"example message\", got #<RuntimeError: example message>")
-  end
-end
-
-describe "should raise_error(NamedError, error_message) with Regexp" do
-  it "should pass if named error is raised with matching message" do
-    lambda { raise "example message" }.should raise_error(RuntimeError, /ample mess/)
-  end
-  
-  it "should fail if nothing is raised" do
-    lambda {
-      lambda {}.should raise_error(RuntimeError, /ample mess/)
-    }.should fail_with("expected RuntimeError with message matching /ample mess/ but nothing was raised")
-  end
-  
-  it "should fail if incorrect error is raised" do
-    lambda {
-      lambda { raise }.should raise_error(NameError, /ample mess/)
-    }.should fail_with("expected NameError with message matching /ample mess/, got RuntimeError")
-  end
-  
-  it "should fail if correct error is raised with incorrect message" do
-    lambda {
-      lambda { raise RuntimeError.new("not the example message") }.should raise_error(RuntimeError, /less than ample mess/)
-    }.should fail_with("expected RuntimeError with message matching /less than ample mess/, got #<RuntimeError: not the example message>")
-  end
-end
-
-describe "should_not raise_error(NamedError, error_message) with Regexp" do
-  it "should pass if nothing is raised" do
-    lambda {}.should_not raise_error(RuntimeError, /ample mess/)
-  end
-  
-  it "should pass if a different error is raised" do
-    lambda { raise }.should_not raise_error(NameError, /ample mess/)
-  end
-  
-  it "should pass if same error is raised with non-matching message" do
-    lambda { raise RuntimeError.new("non matching message") }.should_not raise_error(RuntimeError, /ample mess/)
-  end
-  
-  it "should fail if named error is raised with matching message" do
-    lambda {
-      lambda { raise "example message" }.should_not raise_error(RuntimeError, /ample mess/)
-    }.should fail_with("expected no RuntimeError with message matching /ample mess/, got #<RuntimeError: example message>")
-  end
-end