rspec-core 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48b30f78fc81b772c3546f4bf60a8c375396a642
-  data.tar.gz: 614a957ebe046aad31a3f79be0a15eb475a57b55
+  metadata.gz: 8edadb66ad16d53a8e8b9c24bcb0d6e0d0cf60a4
+  data.tar.gz: 482215825781fdb27385c38e782ae15eea0d4340
 SHA512:
-  metadata.gz: f5548e10c144396ab4922516d43e109c8280085153bebe01963745f543714b2568203aae83eb8ba8c627e37d0d5364469761915eb51572bbc185ae759273f8b4
-  data.tar.gz: f6ee8389462ab8ad0fa78d87ef230c7f0f4ebb21f77a6d23dbfc1daa3e6ad348c1e43d02a7041ecb88ec44cf1f2afae27909a2ab76a8d583eb21f5dd3a17c4ab
+  metadata.gz: 033297ca6896a612fda69a3a7c4f60b98dac28da47312c866a0c1bbfcf799163393b9520f4e158f48d7bdf5b0d8d21dd65091f79779e9fe4e0e0530913588079
+  data.tar.gz: 290acfab949ab5e5bf54b6cb67d298c232e03c3c00155a18754e327d79aa68d0bf8f210db2ee1f6aea2fc9b7271dd518cd08ee606c31a8f66035b4eee92b6e0f

data/Changelog.md

@@ -1,3 +1,11 @@
+### 3.5.1 / 2016-07-06
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.5.0...v3.5.1)
+
+Bug Fixes:
+
+* Ensure that config hooks that are added to existing example groups are
+  added only once. (Eugene Kenny, #2280)
+
 ### 3.5.0 / 2016-07-01
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.5.0.beta4...v3.5.0)
 

data/lib/rspec/core/configuration.rb

@@ -1749,7 +1749,7 @@ module RSpec
         handle_suite_hook(scope, meta) do
           @before_suite_hooks << Hooks::BeforeHook.new(block, {})
         end || begin
-          on_existing_matching_groups({}) { |g| g.before(scope, *meta, &block) }
+          add_hook_to_existing_matching_groups(meta, scope) { |g| g.before(scope, *meta, &block) }
           super(scope, *meta, &block)
         end
       end
@@ -1772,7 +1772,7 @@ module RSpec
         handle_suite_hook(scope, meta) do
           @before_suite_hooks.unshift Hooks::BeforeHook.new(block, {})
         end || begin
-          on_existing_matching_groups({}) { |g| g.prepend_before(scope, *meta, &block) }
+          add_hook_to_existing_matching_groups(meta, scope) { |g| g.prepend_before(scope, *meta, &block) }
           super(scope, *meta, &block)
         end
       end
@@ -1790,7 +1790,7 @@ module RSpec
         handle_suite_hook(scope, meta) do
           @after_suite_hooks.unshift Hooks::AfterHook.new(block, {})
         end || begin
-          on_existing_matching_groups({}) { |g| g.after(scope, *meta, &block) }
+          add_hook_to_existing_matching_groups(meta, scope) { |g| g.after(scope, *meta, &block) }
           super(scope, *meta, &block)
         end
       end
@@ -1813,7 +1813,7 @@ module RSpec
         handle_suite_hook(scope, meta) do
           @after_suite_hooks << Hooks::AfterHook.new(block, {})
         end || begin
-          on_existing_matching_groups({}) { |g| g.append_after(scope, *meta, &block) }
+          add_hook_to_existing_matching_groups(meta, scope) { |g| g.append_after(scope, *meta, &block) }
           super(scope, *meta, &block)
         end
       end
@@ -1822,8 +1822,7 @@ module RSpec
       #
       # See {Hooks#around} for full `around` hook docs.
       def around(scope=nil, *meta, &block)
-        on_existing_matching_groups({}) { |g| g.around(scope, *meta, &block) }
-
+        add_hook_to_existing_matching_groups(meta, scope) { |g| g.around(scope, *meta, &block) }
         super(scope, *meta, &block)
       end
 
@@ -2027,12 +2026,32 @@ module RSpec
         end
       end
 
+      def add_hook_to_existing_matching_groups(meta, scope, &block)
+        # For example hooks, we have to apply it to each of the top level
+        # groups, even if the groups do not match. When we apply it, we
+        # apply it with the metadata, so it will only apply to examples
+        # in the group that match the metadata.
+        # #2280 for background and discussion.
+        if scope == :example || scope == :each || scope.nil?
+          world.example_groups.each(&block)
+        else
+          meta = Metadata.build_hash_from(meta.dup)
+          on_existing_matching_groups(meta, &block)
+        end
+      end
+
       def on_existing_matching_groups(meta)
-        world.all_example_groups.each do |group|
-          yield group if meta.empty? || MetadataFilter.apply?(:any?, meta, group.metadata)
+        world.traverse_example_group_trees_until do |group|
+          metadata_applies_to_group?(meta, group).tap do |applies|
+            yield group if applies
+          end
         end
       end
 
+      def metadata_applies_to_group?(meta, group)
+        meta.empty? || MetadataFilter.apply?(:any?, meta, group.metadata)
+      end
+
       if RSpec::Support::RubyFeatures.module_prepends_supported?
         def safe_prepend(mod, host)
           host.__send__(:prepend, mod) unless host < mod

data/lib/rspec/core/example_group.rb

@@ -450,6 +450,20 @@ module RSpec
         @children ||= []
       end
 
+      # @private
+      # Traverses the tree of groups, starting with `self`, then the children, recursively.
+      # Halts the traversal of a branch of the tree as soon as the passed block returns true.
+      # Note that siblings groups and their sub-trees will continue to be explored.
+      # This is intended to make it easy to find the top-most group that satisfies some
+      # condition.
+      def self.traverse_tree_until(&block)
+        return if yield self
+
+        children.each do |child|
+          child.traverse_tree_until(&block)
+        end
+      end
+
       # @private
       def self.next_runnable_index_for(file)
         if self == ExampleGroup

data/lib/rspec/core/hooks.rb

@@ -191,7 +191,7 @@ module RSpec
       #
       # @note The `:example` and `:context` scopes are also available as
       #       `:each` and `:all`, respectively. Use whichever you prefer.
-      # @note The `:scope` alias is only supported for hooks registered on
+      # @note The `:suite` scope is only supported for hooks registered on
       #       `RSpec.configuration` since they exist independently of any
       #       example or example group.
       def before(*args, &block)
@@ -265,7 +265,7 @@ module RSpec
       #
       # @note The `:example` and `:context` scopes are also available as
       #       `:each` and `:all`, respectively. Use whichever you prefer.
-      # @note The `:scope` alias is only supported for hooks registered on
+      # @note The `:suite` scope is only supported for hooks registered on
       #       `RSpec.configuration` since they exist independently of any
       #       example or example group.
       def after(*args, &block)

data/lib/rspec/core/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Core.
     module Version
       # Current version of RSpec Core, in semantic versioning format.
-      STRING = '3.5.0'
+      STRING = '3.5.1'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -92,6 +92,19 @@ module RSpec
         FlatMap.flat_map(all_example_groups) { |g| g.examples }
       end
 
+      # @private
+      # Traverses the tree of each top level group.
+      # For each it yields the group, then the children, recursively.
+      # Halts the traversal of a branch of the tree as soon as the passed block returns true.
+      # Note that siblings groups and their sub-trees will continue to be explored.
+      # This is intended to make it easy to find the top-most group that satisfies some
+      # condition.
+      def traverse_example_group_trees_until(&block)
+        example_groups.each do |group|
+          group.traverse_tree_until(&block)
+        end
+      end
+
       # @api private
       #
       # Find line number of previous declaration.
@@ -215,6 +228,9 @@ module RSpec
           []
         end
 
+        def self.traverse_example_group_trees_until
+        end
+
         # :nocov:
         def self.example_groups
           []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Steven Baker
@@ -46,7 +46,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -280,9 +280,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.5.0
+summary: rspec-core-3.5.1
 test_files: []
 has_rdoc: 

metadata.gz.sig

@@ -1,3 +1,4 @@
-%k��]F8����&{Q)+ힹ�(����ç�b��-,�r�O��"h�'������۴T||�a��G]-�K���\��a
��b�E@g@(�ǿ-��=��9�c�nA�ȉ����7a����@��.~��\����9���ζ��_�����o�q��ĤM�kP��Y�?��Rg��hm���tE=�ޅ}Љ�ұ
'=��V	ӝOHmit��{G��1�ue�;w
-+���z�Is����e^�>�N�.�}:�}h��*��t(��y������G-Vd�ۖ���xd�!�9^�W�&�6?W��2K����������u�	�^MP?&���]�o-z'ѫ?��C�6)?�˗�Q�He�2/�Fm�ұ6�Q�$��v"�L�*U��n�LWi���
-�R�	��Α*9��M�	͙E�lr ���Q
+Q��AP�3�%,�ֶ�U�NfJD`��2d\�pF*���(&�A�ڹC�ع��e g�C��/�'�rMfp},
+`Չ&O�X�L(@IJEc���o���[M؞�DQTI�T�5��~	xD��ф��)������9+-fy�ۜ�e���^�f~���"���"�пc��sV��h�����)Pvߕ�{sؗ$��	���>V��
��ƪX
+E�'�K�qq�J*�v�?$�	F�N8����7���k/�#�?���'`Jœ�Y�ͷŕRƭ�����$�`dҡQ�P�y��.tGН�G�T7�ϫ@�l�ތ2����Y�0U���!�X���,���fL���F݀ٴV�/�����p�&��+��Mx֟ݔX��
+(�����u���}�ZgY�2^"��yݦ�<d�^z_	�(�JgrNMI�y=KLyXx?Q9�Ǜ�z�-F%U$��0���@���7�G�ܬ�ٟ�g'k�k�0�IE��?Ϳ�&����^��[{�֤