rspec-core 2.13.1 → 2.14.0.rc1

data/spec/rspec/core/resources/formatter_specs.rb

@@ -48,13 +48,13 @@ describe "a failing spec with odd backtraces" do
       ["/foo.html.erb:1:in `<main>': foo (RuntimeError)",
         "   from /lib/ruby/1.9.1/erb.rb:753:in `eval'"]
     end
-    
+
     def e.message
-      # Redefining message steps around this behaviour 
+      # Redefining message steps around this behaviour
       # on JRuby: http://jira.codehaus.org/browse/JRUBY-5637
       self.class.name
     end
-    
+
     raise e
   end
 end

data/spec/rspec/core/shared_context_spec.rb

@@ -34,6 +34,26 @@ describe RSpec::SharedContext do
     expect(after_all_hook).to be_true
   end
 
+  it "runs the before each hooks in configuration before those of the shared context" do
+    ordered_hooks = []
+    RSpec.configure do |c|
+      c.before(:each) { ordered_hooks << "config" }
+    end
+
+    shared_context("before each stuff", :example => :before_each_hook_order) do
+      before(:each) { ordered_hooks << "shared_context"}
+    end
+
+    group = RSpec::Core::ExampleGroup.describe :example => :before_each_hook_order do
+      before(:each) { ordered_hooks << "example_group" }
+      example {}
+    end
+
+    group.run
+
+    expect(ordered_hooks).to be == ["config", "shared_context", "example_group"]
+  end
+
   it "supports let" do
     shared = Module.new do
       extend RSpec::SharedContext

data/spec/rspec/core/shared_example_group/collection_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+module RSpec::Core::SharedExampleGroup
+  describe Collection do
+
+    # this represents:
+    #
+    # shared_examples "top level group"
+    #
+    # context do
+    #   shared_examples "nested level one"
+    # end
+    #
+    # context do
+    #   shared_examples "nested level two"
+    # end
+    #
+    let(:examples) do
+      Hash.new { |hash,k| hash[k] = Hash.new }.tap do |hash|
+        hash["main"]     = { "top level group"  => example_1 }
+        hash["nested 1"] = { "nested level one" => example_2 }
+        hash["nested 2"] = { "nested level two" => example_3 }
+      end
+    end
+    (1..3).each { |num| let("example_#{num}") { double "example #{num}" } }
+
+    context 'setup with one source, which is the top level' do
+
+      let(:collection) { Collection.new ['main'], examples }
+
+      it 'fetches examples from the top level' do
+        expect(collection['top level group']).to eq example_1
+      end
+
+      it 'fetches examples across the nested context' do
+        RSpec.stub(:warn_deprecation)
+        expect(collection['nested level two']).to eq example_3
+      end
+
+      it 'warns about deprecation when you fetch across nested contexts' do
+        RSpec.should_receive(:warn_deprecation)
+        collection['nested level two']
+      end
+    end
+
+    context 'setup with multiple sources' do
+
+      let(:collection) { Collection.new ['main','nested 1'], examples }
+
+      it 'fetches examples from the context' do
+        expect(collection['nested level one']).to eq example_2
+      end
+
+      it 'fetches examples from main' do
+        expect(collection['top level group']).to eq example_1
+      end
+
+      it 'fetches examples across the nested context' do
+        RSpec.stub(:warn_deprecation)
+        expect(collection['nested level two']).to eq example_3
+      end
+
+      it 'warns about deprecation when you fetch across nested contexts' do
+        RSpec.should_receive(:warn_deprecation)
+        collection['nested level two']
+      end
+
+    end
+  end
+end

data/spec/rspec/core/shared_example_group_spec.rb

@@ -33,10 +33,10 @@ module RSpec::Core
         ["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 World's collection of shared example groups" do
+            it "captures the given #{type} and block in the collection of shared example groups" do
               implementation = lambda {}
-              RSpec.world.shared_example_groups.should_receive(:[]=).with(object, implementation)
               send(shared_method_name, object, &implementation)
+              expect(SharedExampleGroup::Registry.shared_example_groups[self][object]).to eq implementation
             end
           end
         end
@@ -55,8 +55,8 @@ module RSpec::Core
         context "given a string and a hash" do
           it "captures the given string and block in the World's collection of shared example groups" do
             implementation = lambda {}
-            RSpec.world.shared_example_groups.should_receive(:[]=).with("name", implementation)
             send(shared_method_name, "name", :foo => :bar, &implementation)
+            expect(SharedExampleGroup::Registry.shared_example_groups[self]["name"]).to eq implementation
           end
 
           it "delegates extend on configuration" do
@@ -72,7 +72,7 @@ module RSpec::Core
     end
 
     describe "#share_as" do
-      before { RSpec.stub(:warn) }
+      before { allow(RSpec).to receive(:deprecate) }
 
       it "is exposed to the global namespace" do
         expect(Kernel).to respond_to("share_as")

data/spec/rspec/core/world_spec.rb

@@ -10,12 +10,10 @@ module RSpec::Core
     let(:world) { RSpec::Core::World.new(configuration) }
 
     describe '#reset' do
-      it 'clears #example_groups and #shared_example_groups' do
+      it 'clears #example_groups' do
         world.example_groups << :example_group
-        world.shared_example_groups[:shared] = :example_group
         world.reset
         expect(world.example_groups).to be_empty
-        expect(world.shared_example_groups).to be_empty
       end
     end
 

data/spec/rspec/core_spec.rb

@@ -7,6 +7,16 @@ describe RSpec do
     end
   end
 
+  describe "::configuration=" do
+    it "sets the configuration object" do
+      configuration = RSpec::Core::Configuration.new
+
+      RSpec.configuration = configuration
+
+      expect(RSpec.configuration).to equal(configuration)
+    end
+  end
+
   describe "::configure" do
     it "yields the current configuration" do
       RSpec.configure do |config|
@@ -21,6 +31,16 @@ describe RSpec do
     end
   end
 
+  describe "::world=" do
+    it "sets the world object" do
+      world = RSpec::Core::World.new
+
+      RSpec.world = world
+
+      expect(RSpec.world).to equal(world)
+    end
+  end
+
   describe "::reset" do
     it "resets the configuration and world objects" do
       config_before_reset = RSpec.configuration

data/spec/spec_helper.rb

@@ -35,37 +35,37 @@ Spork.prefork do
     end
   end
 
-  def sandboxed(&block)
-    @orig_config = RSpec.configuration
-    @orig_world  = RSpec.world
-    new_config = RSpec::Core::Configuration.new
-    new_world  = RSpec::Core::World.new(new_config)
-    RSpec.instance_variable_set(:@configuration, new_config)
-    RSpec.instance_variable_set(:@world, new_world)
-    object = Object.new
-    object.extend(RSpec::Core::SharedExampleGroup)
-
-    (class << RSpec::Core::ExampleGroup; self; end).class_eval do
-      alias_method :orig_run, :run
-      def run(reporter=nil)
-        @orig_mock_space = RSpec::Mocks::space
-        RSpec::Mocks::space = RSpec::Mocks::Space.new
-        orig_run(reporter || NullObject.new)
-      ensure
-        RSpec::Mocks::space = @orig_mock_space
+  module Sandboxing
+    def self.sandboxed(&block)
+      @orig_config = RSpec.configuration
+      @orig_world  = RSpec.world
+      new_config = RSpec::Core::Configuration.new
+      new_world  = RSpec::Core::World.new(new_config)
+      RSpec.configuration = new_config
+      RSpec.world = new_world
+      object = Object.new
+      object.extend(RSpec::Core::SharedExampleGroup)
+
+      (class << RSpec::Core::ExampleGroup; self; end).class_eval do
+        alias_method :orig_run, :run
+        def run(reporter=nil)
+          orig_run(reporter || NullObject.new)
+        end
       end
-    end
 
-    object.instance_eval(&block)
-  ensure
-    (class << RSpec::Core::ExampleGroup; self; end).class_eval do
-      remove_method :run
-      alias_method :run, :orig_run
-      remove_method :orig_run
-    end
+      RSpec::Core::SandboxedMockSpace.sandboxed do
+        object.instance_eval(&block)
+      end
+    ensure
+      (class << RSpec::Core::ExampleGroup; self; end).class_eval do
+        remove_method :run
+        alias_method :run, :orig_run
+        remove_method :orig_run
+      end
 
-    RSpec.instance_variable_set(:@configuration, @orig_config)
-    RSpec.instance_variable_set(:@world, @orig_world)
+      RSpec.configuration = @orig_config
+      RSpec.world = @orig_world
+    end
   end
 
   def in_editor?
@@ -99,7 +99,7 @@ Spork.prefork do
   RSpec.configure do |c|
     # structural
     c.alias_it_behaves_like_to 'it_has_behavior'
-    c.around {|example| sandboxed { example.run }}
+    c.around {|example| Sandboxing.sandboxed { example.run }}
     c.include(RSpecHelpers)
     c.include Aruba::Api, :example_group => {
       :file_path => /spec\/command_line/

data/spec/support/helper_methods.rb

@@ -3,9 +3,17 @@ module RSpecHelpers
     RSpec::Core::Metadata.relative_path(path)
   end
 
+  def ignoring_warnings
+    original = $VERBOSE
+    $VERBOSE = nil
+    result = yield
+    $VERBOSE = original
+    result
+  end
+
   def safely
     Thread.new do
-      $SAFE = 3
+      ignoring_warnings { $SAFE = 3 }
       yield
     end.join
 

data/spec/support/isolate_load_path_mutation.rb

@@ -0,0 +1,6 @@
+shared_context "isolate load path mutation" do
+  original_load_path = nil
+  before { original_load_path = $LOAD_PATH.dup }
+  after  { $LOAD_PATH.replace(original_load_path) }
+end
+

data/spec/support/sandboxed_mock_space.rb

@@ -0,0 +1,100 @@
+require 'rspec/mocks'
+
+module RSpec
+  module Core
+    # Because rspec-core dog-foods itself, rspec-core's spec suite has
+    # examples that define example groups and examples and run them. The
+    # usual lifetime of an RSpec::Mocks::Proxy is for one example
+    # (the proxy cache gets cleared between each example), but since the
+    # specs in rspec-core's suite sometimes create test doubles and pass
+    # them to examples a spec defines and runs, the test double's proxy
+    # must live beyond the inner example: it must live for the scope
+    # of wherever it got defined. Here we implement the necessary semantics
+    # for rspec-core's specs:
+    #
+    # - #verify_all and #reset_all affect only mocks that were created
+    #   within the current scope.
+    # - Mock proxies live for the duration of the scope in which they are
+    #   created.
+    #
+    # Thus, mock proxies created in an inner example live for only that
+    # example, but mock proxies created in an outer example can be used
+    # in an inner example but will only be reset/verified when the outer
+    # example completes.
+    class SandboxedMockSpace < ::RSpec::Mocks::Space
+      def self.sandboxed
+        orig_space = RSpec::Mocks.space
+        RSpec::Mocks.space = RSpec::Core::SandboxedMockSpace.new
+
+        RSpec::Core::Example.class_eval do
+          alias_method :orig_run, :run
+          def run(*args)
+            RSpec::Mocks.space.sandboxed do
+              orig_run(*args)
+            end
+          end
+        end
+
+        yield
+      ensure
+        RSpec::Core::Example.class_eval do
+          remove_method :run
+          alias_method :run, :orig_run
+          remove_method :orig_run
+        end
+
+        RSpec::Mocks.space = orig_space
+      end
+
+      class Sandbox
+        attr_reader :proxies
+
+        def initialize
+          @proxies = Set.new
+        end
+
+        def verify_all
+          @proxies.each { |p| p.verify }
+        end
+
+        def reset_all
+          @proxies.each { |p| p.reset }
+        end
+      end
+
+      def initialize
+        @sandbox_stack = []
+        super
+      end
+
+      def sandboxed
+        @sandbox_stack << Sandbox.new
+        yield
+      ensure
+        @sandbox_stack.pop
+      end
+
+      def verify_all
+        return super unless sandbox = @sandbox_stack.last
+        sandbox.verify_all
+      end
+
+      def reset_all
+        return super unless sandbox = @sandbox_stack.last
+        sandbox.reset_all
+      end
+
+      def proxy_for(object)
+        new_proxy = !proxies.has_key?(object.__id__)
+        proxy = super
+
+        if new_proxy && sandbox = @sandbox_stack.last
+          sandbox.proxies << proxy
+        end
+
+        proxy
+      end
+    end
+  end
+end
+

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 2.13.1
+  prerelease: 7
+  version: 2.14.0.rc1
 platform: ruby
 authors:
 - Steven Baker
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -169,6 +169,7 @@ files:
 - lib/autotest/rspec2.rb
 - lib/rspec/autorun.rb
 - lib/rspec/core.rb
+- lib/rspec/core/backtrace_cleaner.rb
 - lib/rspec/core/backward_compatibility.rb
 - lib/rspec/core/command_line.rb
 - lib/rspec/core/configuration.rb
@@ -187,6 +188,7 @@ files:
 - lib/rspec/core/formatters.rb
 - lib/rspec/core/formatters/base_formatter.rb
 - lib/rspec/core/formatters/base_text_formatter.rb
+- lib/rspec/core/formatters/deprecation_formatter.rb
 - lib/rspec/core/formatters/documentation_formatter.rb
 - lib/rspec/core/formatters/helpers.rb
 - lib/rspec/core/formatters/html_formatter.rb
@@ -196,7 +198,6 @@ files:
 - lib/rspec/core/formatters/snippet_extractor.rb
 - lib/rspec/core/formatters/text_mate_formatter.rb
 - lib/rspec/core/hooks.rb
-- lib/rspec/core/load_path.rb
 - lib/rspec/core/memoized_helpers.rb
 - lib/rspec/core/metadata.rb
 - lib/rspec/core/metadata_hash_builder.rb
@@ -214,6 +215,7 @@ files:
 - lib/rspec/core/runner.rb
 - lib/rspec/core/shared_context.rb
 - lib/rspec/core/shared_example_group.rb
+- lib/rspec/core/shared_example_group/collection.rb
 - lib/rspec/core/version.rb
 - lib/rspec/core/world.rb
 - README.md
@@ -234,12 +236,15 @@ files:
 - features/command_line/order.feature
 - features/command_line/pattern_option.feature
 - features/command_line/rake_task.feature
+- features/command_line/require_option.feature
 - features/command_line/ruby.feature
 - features/command_line/tag.feature
+- features/command_line/warnings_option.feature
 - features/configuration/alias_example_to.feature
 - features/configuration/backtrace_clean_patterns.feature
 - features/configuration/custom_settings.feature
 - features/configuration/default_path.feature
+- features/configuration/deprecation_stream.feature
 - features/configuration/fail_fast.feature
 - features/configuration/failure_exit_code.feature
 - features/configuration/order_and_seed.feature
@@ -257,7 +262,6 @@ files:
 - features/filtering/exclusion_filters.feature
 - features/filtering/if_and_unless.feature
 - features/filtering/inclusion_filters.feature
-- features/filtering/run_all_when_everything_filtered.feature
 - features/formatters/configurable_colors.feature
 - features/formatters/custom_formatter.feature
 - features/formatters/json_formatter.feature
@@ -288,10 +292,12 @@ files:
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
 - spec/command_line/order_spec.rb
+- spec/rspec/core/backtrace_cleaner_spec.rb
 - spec/rspec/core/command_line_spec.rb
 - spec/rspec/core/command_line_spec_output.txt
 - spec/rspec/core/configuration_options_spec.rb
 - spec/rspec/core/configuration_spec.rb
+- spec/rspec/core/deprecation_spec.rb
 - spec/rspec/core/deprecations_spec.rb
 - spec/rspec/core/drb_command_line_spec.rb
 - spec/rspec/core/drb_options_spec.rb
@@ -301,6 +307,7 @@ files:
 - spec/rspec/core/filter_manager_spec.rb
 - spec/rspec/core/formatters/base_formatter_spec.rb
 - spec/rspec/core/formatters/base_text_formatter_spec.rb
+- spec/rspec/core/formatters/deprecation_formatter_spec.rb
 - spec/rspec/core/formatters/documentation_formatter_spec.rb
 - spec/rspec/core/formatters/helpers_spec.rb
 - spec/rspec/core/formatters/html_formatted-1.8.7-jruby.html
@@ -344,15 +351,18 @@ files:
 - spec/rspec/core/ruby_project_spec.rb
 - spec/rspec/core/runner_spec.rb
 - spec/rspec/core/shared_context_spec.rb
+- spec/rspec/core/shared_example_group/collection_spec.rb
 - spec/rspec/core/shared_example_group_spec.rb
 - spec/rspec/core/world_spec.rb
 - spec/rspec/core_spec.rb
 - spec/spec_helper.rb
 - spec/support/config_options_helper.rb
 - spec/support/helper_methods.rb
+- spec/support/isolate_load_path_mutation.rb
 - spec/support/isolated_directory.rb
 - spec/support/isolated_home_directory.rb
 - spec/support/matchers.rb
+- spec/support/sandboxed_mock_space.rb
 - spec/support/shared_example_groups.rb
 - spec/support/spec_files.rb
 - exe/autospec
@@ -372,23 +382,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4384848023819144247
+      hash: 56049946215868305
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 4384848023819144247
+      version: 1.3.1
   none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.13.1
+summary: rspec-core-2.14.0.rc1
 test_files:
 - features/Autotest.md
 - features/README.md
@@ -403,12 +410,15 @@ test_files:
 - features/command_line/order.feature
 - features/command_line/pattern_option.feature
 - features/command_line/rake_task.feature
+- features/command_line/require_option.feature
 - features/command_line/ruby.feature
 - features/command_line/tag.feature
+- features/command_line/warnings_option.feature
 - features/configuration/alias_example_to.feature
 - features/configuration/backtrace_clean_patterns.feature
 - features/configuration/custom_settings.feature
 - features/configuration/default_path.feature
+- features/configuration/deprecation_stream.feature
 - features/configuration/fail_fast.feature
 - features/configuration/failure_exit_code.feature
 - features/configuration/order_and_seed.feature
@@ -426,7 +436,6 @@ test_files:
 - features/filtering/exclusion_filters.feature
 - features/filtering/if_and_unless.feature
 - features/filtering/inclusion_filters.feature
-- features/filtering/run_all_when_everything_filtered.feature
 - features/formatters/configurable_colors.feature
 - features/formatters/custom_formatter.feature
 - features/formatters/json_formatter.feature
@@ -457,10 +466,12 @@ test_files:
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
 - spec/command_line/order_spec.rb
+- spec/rspec/core/backtrace_cleaner_spec.rb
 - spec/rspec/core/command_line_spec.rb
 - spec/rspec/core/command_line_spec_output.txt
 - spec/rspec/core/configuration_options_spec.rb
 - spec/rspec/core/configuration_spec.rb
+- spec/rspec/core/deprecation_spec.rb
 - spec/rspec/core/deprecations_spec.rb
 - spec/rspec/core/drb_command_line_spec.rb
 - spec/rspec/core/drb_options_spec.rb
@@ -470,6 +481,7 @@ test_files:
 - spec/rspec/core/filter_manager_spec.rb
 - spec/rspec/core/formatters/base_formatter_spec.rb
 - spec/rspec/core/formatters/base_text_formatter_spec.rb
+- spec/rspec/core/formatters/deprecation_formatter_spec.rb
 - spec/rspec/core/formatters/documentation_formatter_spec.rb
 - spec/rspec/core/formatters/helpers_spec.rb
 - spec/rspec/core/formatters/html_formatted-1.8.7-jruby.html
@@ -513,15 +525,18 @@ test_files:
 - spec/rspec/core/ruby_project_spec.rb
 - spec/rspec/core/runner_spec.rb
 - spec/rspec/core/shared_context_spec.rb
+- spec/rspec/core/shared_example_group/collection_spec.rb
 - spec/rspec/core/shared_example_group_spec.rb
 - spec/rspec/core/world_spec.rb
 - spec/rspec/core_spec.rb
 - spec/spec_helper.rb
 - spec/support/config_options_helper.rb
 - spec/support/helper_methods.rb
+- spec/support/isolate_load_path_mutation.rb
 - spec/support/isolated_directory.rb
 - spec/support/isolated_home_directory.rb
 - spec/support/matchers.rb
+- spec/support/sandboxed_mock_space.rb
 - spec/support/shared_example_groups.rb
 - spec/support/spec_files.rb
 has_rdoc: