rspec-core 2.14.0.rc1 → 2.14.0

data/Changelog.md

@@ -1,3 +1,17 @@
+### 2.14.0 / 2013-07-06
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.0.rc1...v2.14.0)
+
+Enhancements
+
+* Apply focus to examples defined with `fit` (equivalent of
+  `it "description", focus: true`) (Michael de Silva)
+
+Bug fix
+
+* Ensure methods defined by `let` take precedence over others
+  when there is a name collision (e.g. from an included module).
+  (Jon Rowe, Andy Lindeman and Myron Marston)
+
 ### 2.14.0.rc1 / 2013-05-27
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.13.1...v2.14.0.rc1)
 

data/features/hooks/around_hooks.feature

@@ -182,7 +182,7 @@ Feature: around hooks
         def included_in_configure_block; true; end
       end
 
-      Rspec.configure do |c|
+      RSpec.configure do |c|
         c.include IncludedInConfigureBlock
       end
 

data/lib/rspec/core/deprecation.rb

@@ -8,7 +8,12 @@ module RSpec
         # Temporarily support old and new APIs while we transition the other
         # rspec libs to use a hash for the 2nd arg and no version arg
         data = Hash === replacement_or_hash ? replacement_or_hash : { :replacement => replacement_or_hash }
-        RSpec.configuration.reporter.deprecation data.merge(:deprecated => deprecated, :call_site => caller(0)[2])
+        RSpec.configuration.reporter.deprecation(
+          {
+            :deprecated => deprecated,
+            :call_site => caller(0)[2]
+          }.merge(data)
+        )
       end
 
       # @private

data/lib/rspec/core/example_group.rb

@@ -85,6 +85,9 @@ module RSpec
         define_example_method :focus,   :focused => true, :focus => true
         # Shortcut to define an example with `:focus` => true
         define_example_method :focused, :focused => true, :focus => true
+        # Shortcut to define an example with `:focus` => true
+        # @see example
+        define_example_method :fit,     :focused => true, :focus => true
 
         # Shortcut to define an example with :pending => true
         define_example_method :pending,  :pending => true
@@ -240,6 +243,13 @@ module RSpec
         subclass = Class.new(parent)
         subclass.set_it_up(*args)
         subclass.module_eval(&example_group_block) if example_group_block
+
+        # The LetDefinitions module must be included _after_ other modules
+        # to ensure that it takes precendence when there are name collisions.
+        # Thus, we delay including it until after the example group block
+        # has been eval'd.
+        MemoizedHelpers.define_helpers_on(subclass)
+
         subclass
       end
 

data/lib/rspec/core/memoized_helpers.rb

@@ -45,8 +45,12 @@ module RSpec
       #
       # @see #should
       def subject
-        raise NotImplementedError, 'This definition is here for documentation purposes only'
-          ' - it is overriden anyway below when this module gets included.'
+        __memoized.fetch(:subject) do
+          __memoized[:subject] = begin
+            described = described_class || self.class.description
+            Class === described ? described.new : described
+          end
+        end
       end
 
       # When `should` is called with no explicit receiver, the call is
@@ -148,12 +152,6 @@ EOS
 
       def self.included(mod)
         mod.extend(ClassMethods)
-
-        # This logic defines an implicit subject
-        mod.subject do
-          described = described_class || self.class.description
-          Class === described ? described.new : described
-        end
       end
 
       module ClassMethods
@@ -471,12 +469,16 @@ EOS
             }
           end
 
-          example_group.__send__(:include, mod)
           example_group.const_set(:LetDefinitions, mod)
           mod
         end
       end
 
+      # @api private
+      def self.define_helpers_on(example_group)
+        example_group.send(:include, module_for(example_group))
+      end
+
       if Module.method(:const_defined?).arity == 1 # for 1.8
         # @api private
         #

data/lib/rspec/core/reporter.rb

@@ -2,7 +2,7 @@ module RSpec::Core
   class Reporter
     NOTIFICATIONS = %W[start message example_group_started example_group_finished example_started
                        example_passed example_failed example_pending start_dump dump_pending
-                       dump_failures dump_summary seed close stop deprecation deprecation_summary].map(&:to_sym)
+                       dump_failures dump_summary seed close stop deprecation deprecation_summary].map { |n| n.to_sym }
 
     def initialize(*formatters)
       @listeners = Hash.new { |h,k| h[k] = [] }

data/lib/rspec/core/shared_context.rb

@@ -17,31 +17,37 @@ module RSpec
     #       # ...
     #     end
     module SharedContext
-      include Hooks
-      include MemoizedHelpers::ClassMethods
-
+      # @api private
       def included(group)
-        [:before, :after].each do |type|
-          [:all, :each].each do |scope|
-            group.hooks[type][scope].concat hooks[type][scope]
-          end
-        end
-        _nested_group_declarations.each do |name, block, *args|
-          group.describe name, *args, &block
+        __shared_context_recordings.each do |recording|
+          recording.playback_onto(group)
         end
       end
 
-      def describe(name, *args, &block)
-        _nested_group_declarations << [name, block, *args]
+      # @api private
+      def __shared_context_recordings
+        @__shared_context_recordings ||= []
       end
 
-      alias_method :context, :describe
-
-      private
+      Recording = Struct.new(:method_name, :args, :block) do
+        def playback_onto(group)
+          group.__send__(method_name, *args, &block)
+        end
+      end
 
-      def _nested_group_declarations
-        @_nested_group_declarations ||= []
+      # @api private
+      def self.record(methods)
+        methods.each do |meth|
+          class_eval <<-EOS, __FILE__, __LINE__ + 1
+            def #{meth}(*args, &block)
+              __shared_context_recordings << Recording.new(:#{meth}, args, block)
+            end
+          EOS
+        end
       end
+
+      record [:describe, :context] + Hooks.instance_methods(false) +
+        MemoizedHelpers::ClassMethods.instance_methods(false)
     end
   end
 

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.14.0.rc1'
+      STRING = '2.14.0'
     end
   end
 end

data/spec/rspec/core/configuration_spec.rb

@@ -1106,11 +1106,6 @@ module RSpec::Core
         debugger.should_receive(:start)
         config.debug = true
       end
-
-      it 'sets the reader to true' do
-        config.debug = true
-        expect(config.debug?).to eq true
-      end
     end
 
     describe "#debug=false" do
@@ -1118,10 +1113,17 @@ module RSpec::Core
         config.should_not_receive(:require).with('ruby-debug')
         config.debug = false
       end
+    end
 
-      it 'sets the reader to false' do
-        config.debug = false
-        expect(config.debug?).to eq false
+    describe "#debug?" do
+      it 'returns true if the debugger has been loaded' do
+        stub_const("Debugger", Object.new)
+        expect(config.debug?).to be_true
+      end
+
+      it 'returns false if the debugger has not been loaded' do
+        hide_const("Debugger")
+        expect(config.debug?).to be_false
       end
     end
 

data/spec/rspec/core/deprecation_spec.rb

@@ -17,6 +17,11 @@ describe RSpec::Core::Deprecation do
         expect(RSpec.configuration.reporter).to receive(:deprecation).with(hash_including :call_site => caller(0)[1])
         RSpec.deprecate("deprecated_method")
       end
+
+      it "doesn't override the existing callsite" do
+        expect(RSpec.configuration.reporter).to receive(:deprecation).with(hash_including :call_site => "/path")
+        RSpec.deprecate("deprecated_method", :call_site => "/path")
+      end
     end
 
     context "new API with a hash after the first arg" do

data/spec/rspec/core/example_group_spec.rb

@@ -397,7 +397,7 @@ module RSpec::Core
       end
     end
 
-    [:focus, :focused].each do |example_alias|
+    [:focus, :focused, :fit].each do |example_alias|
       describe "##{example_alias}" do
         let(:focused_example) { ExampleGroup.describe.send example_alias, "a focused example" }
 

data/spec/rspec/core/memoized_helpers_spec.rb

@@ -616,6 +616,24 @@ module RSpec::Core
         })
       end
     end
+
+    context "when included modules have hooks that define memoized helpers" do
+      it "allows memoized helpers to override methods in previously included modules" do
+        group = ExampleGroup.describe do
+          include Module.new {
+            def self.included(m); m.let(:unrelated) { :unrelated }; end
+          }
+
+          include Module.new {
+            def hello_message; "Hello from module"; end
+          }
+
+          let(:hello_message) { "Hello from let" }
+        end
+
+        expect(group.new.hello_message).to eq("Hello from let")
+      end
+    end
   end
 
   describe "#let!" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  prerelease: 7
-  version: 2.14.0.rc1
+  prerelease: 
+  version: 2.14.0
 platform: ruby
 authors:
 - Steven Baker
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -382,20 +382,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 56049946215868305
+      hash: -1933471996242347119
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -1933471996242347119
   none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.14.0.rc1
+summary: rspec-core-2.14.0
 test_files:
 - features/Autotest.md
 - features/README.md