rspec-core 2.11.0 → 2.11.1

data/Changelog.md

@@ -1,3 +1,18 @@
+### 2.11.1 / 2012-07-18
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.11.0...v2.11.1)
+
+Bug fixes
+
+* Fix the way we autoload RSpec::Matchers so that custom matchers can be
+  defined before rspec-core has been configured to definitely use
+  rspec-expectations. (Myron Marston)
+* Fix typo in --help message printed for -e option. (Jo Liss)
+* Fix ruby warnings. (Myron Marston)
+* Ignore mock expectation failures when the example has already failed.
+  Mock expectation failures have always been ignored in this situation,
+  but due to my changes in 27059bf1 it was printing a confusing message.
+  (Myron Marston).
+
 ### 2.11.0 / 2012-07-07
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.10.1...v2.11.0)
 

data/features/expectation_framework_integration/configure_expectation_framework.feature

@@ -13,6 +13,22 @@ Feature: configure expectation framework
   provide a description to every example.  You cannot rely on the generated
   descriptions provided by rspec-expectations.
 
+  Scenario: rspec-expectations can be used by default if nothing is configured
+    Given a file named "example_spec.rb" with:
+      """
+      RSpec::Matchers.define :be_a_multiple_of do |factor|
+        match do |actual|
+          actual % factor == 0
+        end
+      end
+
+      describe 6 do
+        it { should be_a_multiple_of(3) }
+      end
+      """
+    When I run `rspec example_spec.rb`
+    Then the examples should all pass
+
   Scenario: configure rspec-expectations (explicitly)
     Given a file named "example_spec.rb" with:
       """

data/lib/rspec/core.rb

@@ -40,7 +40,6 @@ require_rspec 'core/example_group'
 require_rspec 'core/version'
 
 module RSpec
-  autoload :Matchers,      'rspec/matchers'
   autoload :SharedContext, 'rspec/core/shared_context'
 
   # @private
@@ -106,6 +105,22 @@ module RSpec
 
   module Core
   end
+
+  def self.const_missing(name)
+    case name
+      when :Matchers
+        # Load rspec-expectations when RSpec::Matchers is referenced. This allows
+        # people to define custom matchers (using `RSpec::Matchers.define`) before
+        # rspec-core has loaded rspec-expectations (since it delays the loading of
+        # it to allow users to configure a different assertion/expectation
+        # framework). `autoload` can't be used since it works with ruby's built-in
+        # require (e.g. for files that are available relative to a load path dir),
+        # but not with rubygems' extended require.
+        require 'rspec/expectations'
+        ::RSpec::Matchers
+      else super
+    end
+  end
 end
 
 require_rspec 'core/backward_compatibility'

data/lib/rspec/core/example.rb

@@ -205,7 +205,7 @@ module RSpec
       # Used internally to set an exception in an after hook, which
       # captures the exception but doesn't raise it.
       def set_exception(exception, context=nil)
-        if @exception
+        if @exception && context != :dont_print
           # An error has already been set; we don't want to override it,
           # but we also don't want silence the error, so let's print it.
           msg = <<-EOS
@@ -301,13 +301,19 @@ An error occurred #{context}
 
       def run_after_each
         @example_group_class.run_after_each_hooks(self)
-        @example_group_instance.verify_mocks_for_rspec
+        verify_mocks
       rescue Exception => e
         set_exception(e, "in an after(:each) hook")
       ensure
         @example_group_instance.teardown_mocks_for_rspec
       end
 
+      def verify_mocks
+        @example_group_instance.verify_mocks_for_rspec
+      rescue Exception => e
+        set_exception(e, :dont_print)
+      end
+
       def assign_generated_description
         return unless RSpec.configuration.expecting_with_rspec?
         if metadata[:description].empty? and !pending?

data/lib/rspec/core/option_parser.rb

@@ -134,8 +134,8 @@ FILTERING
           options[:pattern] = o
         end
 
-        parser.on('-e', '--example STRING', "Run examples whose full nested names include STRING (may be',
-                                              '  used more than once)") do |o|
+        parser.on('-e', '--example STRING', "Run examples whose full nested names include STRING (may be",
+                                            "  used more than once)") do |o|
           (options[:full_description] ||= []) << Regexp.compile(Regexp.escape(o))
         end
 

data/lib/rspec/core/shared_example_group.rb

@@ -38,7 +38,7 @@ module RSpec
         unless args.empty?
           mod = Module.new
           (class << mod; self; end).send :define_method, :extended  do |host|
-            host.class_eval &block
+            host.class_eval(&block)
           end
           RSpec.configuration.extend mod, *args
         end

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.11.0'
+      STRING = '2.11.1'
     end
   end
 end

data/spec/rspec/core/configuration_spec.rb

@@ -83,7 +83,7 @@ module RSpec::Core
         lambda do
           config.send m, mod do |mod_config|
           end
-        end.should raise_error /must respond to `configuration`/
+        end.should raise_error(/must respond to `configuration`/)
       end
     end
 
@@ -179,7 +179,7 @@ module RSpec::Core
         lambda do
           config.expect_with :rspec, :stdlib do |mod_config|
           end
-        end.should raise_error /expect_with only accepts/
+        end.should raise_error(/expect_with only accepts/)
       end
 
       it "raises ArgumentError if framework is not supported" do

data/spec/rspec/core/example_spec.rb

@@ -259,37 +259,48 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
       end
     end
 
-    context "when the example and an around hook raise errors" do
-      it "prints the around hook error rather than silencing it" do
-        group = RSpec::Core::ExampleGroup.describe do
-          around(:each) { |e| e.run; raise "around" }
-          example("e") { raise "example" }
-        end
-
+    context 'when the example raises an error' do
+      def run_and_capture_reported_message(group)
         reported_msg = nil
         # We can't use should_receive(:message).with(/.../) here,
         # because if that fails, it would fail within our example-under-test,
         # and since there's already two errors, it would just be reported again.
         RSpec.configuration.reporter.stub(:message) { |msg| reported_msg = msg }
         group.run
-        reported_msg.should =~ /An error occurred in an around.* hook/i
+        reported_msg
+      end
+
+      it "prints any around hook errors rather than silencing them" do
+        group = RSpec::Core::ExampleGroup.describe do
+          around(:each) { |e| e.run; raise "around" }
+          example("e") { raise "example" }
+        end
+
+        message = run_and_capture_reported_message(group)
+        message.should =~ /An error occurred in an around.* hook/i
       end
-    end
 
-    context "when the example and an after hook raise errors" do
-      it "prints the after hook error rather than silencing it" do
+      it "prints any after hook errors rather than silencing them" do
         group = RSpec::Core::ExampleGroup.describe do
           after(:each) { raise "after" }
           example("e") { raise "example" }
         end
 
-        reported_msg = nil
-        # We can't use should_receive(:message).with(/.../) here,
-        # because if that fails, it would fail within our example-under-test,
-        # and since there's already two errors, it would just be reported again.
-        RSpec.configuration.reporter.stub(:message) { |msg| reported_msg = msg }
-        group.run
-        reported_msg.should =~ /An error occurred in an after.* hook/i
+        message = run_and_capture_reported_message(group)
+        message.should =~ /An error occurred in an after.* hook/i
+      end
+
+      it 'does not print mock expectation errors' do
+        group = RSpec::Core::ExampleGroup.describe do
+          example do
+            foo = mock
+            foo.should_receive(:bar)
+            raise "boom"
+          end
+        end
+
+        message = run_and_capture_reported_message(group)
+        message.should be_nil
       end
     end
   end

data/spec/rspec/core/option_parser_spec.rb

@@ -68,7 +68,7 @@ module RSpec::Core
       describe option do
         it "escapes the arg" do
           options = Parser.parse!([option, "this (and that)"])
-          options[:full_description].length.should == 1
+          options[:full_description].length.should eq(1)
           "this (and that)".should match(options[:full_description].first)
         end
       end

metadata

@@ -1,186 +1,194 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rspec-core
-version: !ruby/object:Gem::Version
-  version: 2.11.0
+version: !ruby/object:Gem::Version 
+  hash: 33
   prerelease: 
+  segments: 
+  - 2
+  - 11
+  - 1
+  version: 2.11.1
 platform: ruby
-authors:
+authors: 
 - Steven Baker
 - David Chelimsky
 - Chad Humphries
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
-- !ruby/object:Gem::Dependency
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.9
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 1
+        - 9
         version: 1.1.9
-- !ruby/object:Gem::Dependency
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.11
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 4
+        - 11
         version: 0.4.11
-- !ruby/object:Gem::Dependency
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   name: ZenTest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 4
+        - 6
+        - 2
         version: 4.6.2
-- !ruby/object:Gem::Dependency
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
-- !ruby/object:Gem::Dependency
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
-- !ruby/object:Gem::Dependency
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   name: syntax
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-- !ruby/object:Gem::Dependency
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.5
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 10
+        - 5
         version: 0.10.5
-- !ruby/object:Gem::Dependency
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
   name: rr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 0
+        - 4
         version: 1.0.4
-- !ruby/object:Gem::Dependency
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
   name: flexmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
+  requirement: *id010
 description: BDD for Ruby. RSpec runner and example groups.
 email: rspec-users@rubyforge.org
-executables:
+executables: 
 - autospec
 - rspec
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/autotest/discover.rb
 - lib/autotest/rspec2.rb
 - lib/rspec/autorun.rb
@@ -349,43 +357,42 @@ files:
 - spec/support/matchers.rb
 - spec/support/shared_example_groups.rb
 - spec/support/spec_files.rb
-- !binary |-
-  ZXhlL2F1dG9zcGVj
-- !binary |-
-  ZXhlL3JzcGVj
+- exe/autospec
+- exe/rspec
 homepage: http://github.com/rspec/rspec-core
-licenses:
+licenses: 
 - MIT
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2822147403223549363
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2822147403223549363
+      version: "0"
 requirements: []
+
 rubyforge_project: rspec
-rubygems_version: 1.8.24
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.11.0
-test_files:
+summary: rspec-core-2.11.1
+test_files: 
 - features/Autotest.md
 - features/README.md
 - features/Upgrade.md