rspec-core 2.14.4 → 2.14.5

data/Changelog.md

@@ -1,3 +1,18 @@
+### 2.14.5 / 2013-08-13
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.4...v2.14.5)
+
+Bug fixes:
+
+* Fix a `NoMethodError` that was being raised when there were no shared
+  examples or contexts declared and `RSpec.world.reset` is invoked.
+  (thepoho, Jon Rowe, Myron Marston)
+* Fix a deprecation warning that was being incorrectly displayed when
+  `shared_examples` are declared at top level in a `module` scope.
+  (Jon Rowe)
+* Fix after(:all) hooks so consecutive (same context) scopes will run even if
+  one raises an error. (Jon Rowe, Trejkaz)
+* JsonFormatter no longer dies if `dump_profile` isn't defined (Alex / @MasterLambaster, Jon Rowe)
+
 ### 2.14.4 / 2013-07-21
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.14.3...v2.14.4)
 

data/lib/rspec/core/example_group.rb

@@ -21,6 +21,7 @@ module RSpec
       include Extensions::InstanceEvalWithArgs
       include Pending
       include SharedExampleGroup
+      extend SharedExampleGroup
 
       # @private
       def self.world
@@ -354,18 +355,7 @@ module RSpec
         return if descendant_filtered_examples.empty?
         assign_before_all_ivars(before_all_ivars, example_group_instance)
 
-        begin
-          run_hook(:after, :all, example_group_instance)
-        rescue => e
-          # TODO: come up with a better solution for this.
-          RSpec.configuration.reporter.message <<-EOS
-
-An error occurred in an after(:all) hook.
-  #{e.class}: #{e.message}
-  occurred at #{e.backtrace.first}
-
-      EOS
-        end
+        run_hook(:after, :all, example_group_instance)
       end
 
       # Runs all the examples in this group

data/lib/rspec/core/formatters/json_formatter.rb

@@ -27,8 +27,6 @@ module RSpec
             :pending_count => pending_count
           }
           @output_hash[:summary_line] = summary_line(example_count, failure_count, pending_count)
-
-          dump_profile unless mute_profile_output?(failure_count)
         end
 
         def summary_line(example_count, failure_count, pending_count)

data/lib/rspec/core/hooks.rb

@@ -36,6 +36,25 @@ module RSpec
         end
       end
 
+      class AfterAllHook < Hook
+        def run(example)
+          example.instance_exec(example, &block)
+        rescue Exception => e
+          # TODO: come up with a better solution for this.
+          RSpec.configuration.reporter.message <<-EOS
+
+An error occurred in an after(:all) hook.
+  #{e.class}: #{e.message}
+  occurred at #{e.backtrace.first}
+
+EOS
+        end
+
+        def display_name
+          "after(:all) hook"
+        end
+      end
+
       class AroundHook < Hook
         def display_name
           "around hook"
@@ -437,11 +456,13 @@ module RSpec
       SCOPES = [:each, :all, :suite]
 
       HOOK_TYPES = {
-        :before => BeforeHook,
-        :after  => AfterHook,
-        :around => AroundHook
+        :before => Hash.new { BeforeHook },
+        :after  => Hash.new { AfterHook  },
+        :around => Hash.new { AroundHook }
       }
 
+      HOOK_TYPES[:after][:all] = AfterAllHook
+
       def before_all_hooks_for(group)
         GroupHookCollection.new(hooks[:before][:all]).for(group)
       end
@@ -460,7 +481,7 @@ module RSpec
 
       def register_hook prepend_or_append, hook, *args, &block
         scope, options = scope_and_options_from(*args)
-        hooks[hook][scope].send(prepend_or_append, HOOK_TYPES[hook].new(block, options))
+        hooks[hook][scope].send(prepend_or_append, HOOK_TYPES[hook][scope].new(block, options))
       end
 
       def find_hook(hook, scope, example_or_group, initial_procsy)

data/lib/rspec/core/shared_example_group.rb

@@ -29,7 +29,7 @@ module RSpec
       # @see ExampleGroup.include_examples
       # @see ExampleGroup.include_context
       def shared_examples(*args, &block)
-        Registry.add_group(self, *args, &block)
+        SharedExampleGroup.registry.add_group(self, *args, &block)
       end
 
       alias_method :shared_context,      :shared_examples
@@ -40,16 +40,16 @@ module RSpec
       def share_as(name, &block)
         RSpec.deprecate("Rspec::Core::SharedExampleGroup#share_as",
                         :replacement => "RSpec::SharedContext or shared_examples")
-        Registry.add_const(self, name, &block)
+        SharedExampleGroup.registry.add_const(self, name, &block)
       end
 
       def shared_example_groups
-        Registry.shared_example_groups_for('main', *ancestors[0..-1])
+        SharedExampleGroup.registry.shared_example_groups_for('main', *ancestors[0..-1])
       end
 
       module TopLevelDSL
         def shared_examples(*args, &block)
-          Registry.add_group('main', *args, &block)
+          SharedExampleGroup.registry.add_group('main', *args, &block)
         end
 
         alias_method :shared_context,      :shared_examples
@@ -59,14 +59,18 @@ module RSpec
         def share_as(name, &block)
           RSpec.deprecate("Rspec::Core::SharedExampleGroup#share_as",
                           :replacement => "RSpec::SharedContext or shared_examples")
-          Registry.add_const('main', name, &block)
+          SharedExampleGroup.registry.add_const('main', name, &block)
         end
 
         def shared_example_groups
-          Registry.shared_example_groups_for('main')
+          SharedExampleGroup.registry.shared_example_groups_for('main')
         end
       end
 
+      def self.registry
+        @registry ||= Registry.new
+      end
+
       # @private
       #
       # Used internally to manage the shared example groups and
@@ -74,9 +78,7 @@ module RSpec
       # to objects we don't own (main and Module) so this allows
       # us to have helper methods that don't get added to those
       # objects.
-      module Registry
-        extend self
-
+      class Registry
         def add_group(source, *args, &block)
           ensure_block_has_source_location(block, caller[1])
 
@@ -128,7 +130,7 @@ module RSpec
         end
 
         def clear
-          @shared_example_groups.clear
+          shared_example_groups.clear
         end
 
       private
@@ -180,5 +182,4 @@ module RSpec
 end
 
 extend RSpec::Core::SharedExampleGroup::TopLevelDSL
-Module.send(:include, RSpec::Core::SharedExampleGroup)
-
+Module.send(:include, RSpec::Core::SharedExampleGroup::TopLevelDSL)

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.14.4'
+      STRING = '2.14.5'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -22,7 +22,7 @@ module RSpec
 
       def reset
         example_groups.clear
-        SharedExampleGroup::Registry.clear
+        SharedExampleGroup.registry.clear
       end
 
       def filter_manager

data/spec/rspec/core/example_group_spec.rb

@@ -638,13 +638,17 @@ module RSpec::Core
       end
 
       context "when an error occurs in an after(:all) hook" do
+        hooks_run = []
+
         before(:each) do
+          hooks_run = []
           RSpec.configuration.reporter.stub(:message)
         end
 
         let(:group) do
           ExampleGroup.describe do
-            after(:all) { raise "error in after all" }
+            after(:all) { hooks_run << :one; raise "An error in an after(:all) hook" }
+            after(:all) { hooks_run << :two; raise "A different hook raising an error" }
             it("equality") { expect(1).to eq(1) }
           end
         end
@@ -657,9 +661,15 @@ module RSpec::Core
           expect(example.metadata[:execution_result][:status]).to eq("passed")
         end
 
-        it "rescues the error and prints it out" do
-          RSpec.configuration.reporter.should_receive(:message).with(/error in after all/)
+        it "rescues any error(s) and prints them out" do
+          RSpec.configuration.reporter.should_receive(:message).with(/An error in an after\(:all\) hook/)
+          RSpec.configuration.reporter.should_receive(:message).with(/A different hook raising an error/)
+          group.run
+        end
+
+        it "still runs both after blocks" do
           group.run
+          expect(hooks_run).to eq [:two,:one]
         end
       end
 

data/spec/rspec/core/formatters/json_formatter_spec.rb

@@ -106,5 +106,10 @@ describe RSpec::Core::Formatters::JsonFormatter do
       summary_line = formatter.output_hash[:summary_line]
       expect(summary_line).to eq "2 examples, 1 failure, 1 pending"
     end
+
+    it "ignores --profile" do
+      allow(RSpec.configuration).to receive(:profile_examples).and_return(true)
+      formatter.dump_summary(1.0, 2, 1, 1)
+    end
   end
 end

data/spec/rspec/core/shared_example_group_spec.rb

@@ -1,5 +1,11 @@
 require 'spec_helper'
 
+module RandomTopLevelModule
+  def self.setup!
+    shared_examples_for("top level in module") {}
+  end
+end
+
 module RSpec::Core
   describe SharedExampleGroup do
 
@@ -11,6 +17,19 @@ module RSpec::Core
       expect(Module.private_methods & seg_methods).to eq([])
     end
 
+    module SharedExampleGroup
+      describe Registry do
+        it "can safely be reset when there aren't any shared groups" do
+          expect { Registry.new.clear }.to_not raise_error
+        end
+      end
+    end
+
+    before(:all) do
+      # this is a work around as SharedExampleGroup is not world safe
+      RandomTopLevelModule.setup!
+    end
+
     %w[share_examples_for shared_examples_for shared_examples shared_context].each do |shared_method_name|
       describe shared_method_name do
         it "is exposed to the global namespace" do
@@ -30,13 +49,18 @@ module RSpec::Core
           expect(warning).to include('some shared group', original_declaration, second_declaration)
         end
 
+        it 'works with top level defined examples in modules' do
+          expect(RSpec::configuration.reporter).to_not receive(:deprecation)
+          group = ExampleGroup.describe('example group') { include_context 'top level in module' }
+        end
+
         ["name", :name, ExampleModule, ExampleClass].each do |object|
           type = object.class.name.downcase
           context "given a #{type}" do
             it "captures the given #{type} and block in the collection of shared example groups" do
               implementation = lambda {}
               send(shared_method_name, object, &implementation)
-              expect(SharedExampleGroup::Registry.shared_example_groups[self][object]).to eq implementation
+              expect(SharedExampleGroup.registry.shared_example_groups[self][object]).to eq implementation
             end
           end
         end
@@ -56,7 +80,7 @@ module RSpec::Core
           it "captures the given string and block in the World's collection of shared example groups" do
             implementation = lambda {}
             send(shared_method_name, "name", :foo => :bar, &implementation)
-            expect(SharedExampleGroup::Registry.shared_example_groups[self]["name"]).to eq implementation
+            expect(SharedExampleGroup.registry.shared_example_groups[self]["name"]).to eq implementation
           end
 
           it "delegates extend on configuration" do

metadata

@@ -2,7 +2,7 @@
 name: rspec-core
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.14.4
+  version: 2.14.5
 platform: ruby
 authors:
 - Steven Baker
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -383,7 +383,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 409767049060748500
+      hash: 2492327081030983877
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -392,14 +392,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 409767049060748500
+      hash: 2492327081030983877
   none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.14.4
+summary: rspec-core-2.14.5
 test_files:
 - features/Autotest.md
 - features/README.md