rspec-core 3.5.0.beta3 → 3.5.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb7575d0b8b74488fe65c38a1309ed0e81fb553b
-  data.tar.gz: bd6fccb0c6652936a44cd8159e328f581af3c72e
+  metadata.gz: 869c418b1e6c72f2af99494959561aad32116de1
+  data.tar.gz: 112822b696a2ad0b8679a0a59d5fd411d528acaf
 SHA512:
-  metadata.gz: e036ab4dc99141921ab013f94cc58434b5e16ec3e58a0675cfbaa44a7236b676f16eb81f6e7b02ed211f229298350170ca5c97903c8d84046a548280cae4f926
-  data.tar.gz: f55ba181425dd3c264d4a16983718140e43469a28c25300a077858a528d3403d39fad355fde0ca7a8c4156f1a7be41cd846bd4b3c9efc664873bc72dbd25ddc3
+  metadata.gz: 1fbe6dc5949d8a192d76ee6f27ad90f1166e557c70a2d3ac9c898e4b700f60778234cd672a2de14bdb0304a11c5918527bd21935a315ba94c84916bb2b418445
+  data.tar.gz: 4354f81e094d54d517a46c738001c5f7f77f8d55e1e4f2a2d229a5f260aece474720f6f9a07fdc1015f57fbd89ca93e0ceef2d5d88e34d7d86afc33a94b2f1cf

data/Changelog.md

@@ -1,16 +1,43 @@
-### Development
-[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.5.0.beta1...master)
+### 3.5 Development
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.5.0.beta4...master)
+
+### 3.5.0.beta4 / 2016-06-05
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.5.0.beta3...v3.5.0.beta4)
+
+Enhancements:
+
+* Filter out bundler stackframes from backtraces by default, since
+  Bundler 1.12 now includes its own frames in stack traces produced
+  by using `bundle exec`. (Myron Marston, #2240)
+* HTML Formatter uses exception presenter to get failure message
+  for consistency with other formatters. (@mrageh, #2222)
+* Load spec files in the order of the directories or files passed
+  at the command line, making it easy to make some specs run before
+  others in a one-off manner.  For example, `rspec spec/unit
+  spec/acceptance --order defined` will run unit specs before acceptance
+  specs. (Myron Marston, #2253)
+* Add new `config.include_context` API for configuring global or
+  filtered inclusion of shared contexts in example groups.
+  (Myron Marston, #2256)
+* Add new `config.shared_context_metadata_behavior = :apply_to_host_groups`
+  option, which causes shared context metadata to be inherited by the
+  metadata hash of all host groups and examples instead of configuring
+  implicit auto-inclusion based on the passed metadata. (Myron Marston, #2256)
+
+Bug Fixes:
+
+* Fix `--bisect` so it works on large spec suites that were previously triggering
+  "Argument list too long errors" due to all the spec locations being passed as
+  CLI args. (Matt Jones, #2223).
+* Fix deprecated `:example_group`-based filtering so that it properly
+  applies to matching example groups. (Myron Marston, #2234)
+* Fix `NoMethodError` caused by Java backtraces on JRuby. (Michele Piccirillo, #2244)
+
+### 3.5.0.beta3 / 2016-04-02
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.5.0.beta2...v3.5.0.beta3)
 
 Enhancements:
 
-* Remove unneeded `:execution_result` example groups metadata, saving a
-  bit of memory. (Myron Marston, #2172)
-* Apply hooks registered with `config` to previously defined groups.
-  (Myron Marston, #2189)
-* `RSpec::Core::Configuration#reporter` is now public API under semver.
-  (Jon Rowe, #2193)
-* Add new `config.when_first_matching_example_defined` hook. (Myron
-  Marston, #2175)
 * Add new `config.filter_run_when_matching` API, intended to replace
   the combination of `config.filter_run` and
   `config.run_all_when_everything_filtered` (Myron Marston, #2206)
@@ -23,8 +50,32 @@ Bug Fixes:
   ending with `end`-only line can be extracted properly.
   (Yuji Nakayama, #2215)
 
+### 3.5.0.beta2 / 2016-03-10
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.5.0.beta1...v3.5.0.beta2)
+
+Enhancements:
+
+* Remove unneeded `:execution_result` example group metadata, saving a
+  bit of memory. (Myron Marston, #2172)
+* Apply hooks registered with `config` to previously defined groups.
+  (Myron Marston, #2189)
+* `RSpec::Core::Configuration#reporter` is now public API under SemVer.
+  (Jon Rowe, #2193)
+* Add new `config.when_first_matching_example_defined` hook. (Myron
+  Marston, #2175)
+
 ### 3.5.0.beta1 / 2016-02-06
-[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.3...v3.5.0.beta1)
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.4...v3.5.0.beta1)
+
+Enhancements:
+
+* Add `RSpec::Core::ExampleGroup.currently_executing_a_context_hook?`,
+  primarily for use by rspec-rails. (Sam Phippen, #2131)
+
+Bug Fixes:
+
+* Ensure `MultipleExceptionError` does not contain a recursive reference
+  to itself. (Sam Phippen, #2133)
 
 ### 3.4.4 / 2016-03-09
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.3...v3.4.4)
@@ -39,7 +90,7 @@ Bug Fixes:
 
 Bug Fixes:
 
-* Prevent a `TypeError` from occuring when running via the rake task when
+* Prevent a `TypeError` from occurring when running via the rake task when
   Ruby crashes. (Patrik Wenger, #2161)
 * Only consider example and group declaration lines from a specific file
   when applying line number filtering, instead of considering all
@@ -47,6 +98,8 @@ Bug Fixes:
 * Fix failure snippet extraction so that snippets that contain `do-end` style
   block and end with `end`-only line can be extracted properly.
   (Yuji Nakayama, #2173)
+* Prevent infinite recursion when an exception is caused by itself.
+  (Jon Rowe, #2128)
 
 ### 3.4.2 / 2016-01-26
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.1...v3.4.2)

data/lib/rspec/core/backtrace_formatter.rb

@@ -8,7 +8,7 @@ module RSpec
       def initialize
         @full_backtrace = false
 
-        patterns = %w[ /lib\d*/ruby/ bin/ exe/rspec ]
+        patterns = %w[ /lib\d*/ruby/ bin/ exe/rspec /lib/bundler/ /exe/bundle: ]
         patterns << "org/jruby/" if RUBY_PLATFORM == 'java'
         patterns.map! { |s| Regexp.new(s.gsub("/", File::SEPARATOR)) }
 

data/lib/rspec/core/bisect/runner.rb

@@ -27,6 +27,7 @@ module RSpec
 
           parts << "--format"   << "bisect"
           parts << "--drb-port" << @server.drb_port
+
           parts.concat reusable_cli_options
           parts.concat locations.map { |l| open3_safe_escape(l) }
 
@@ -60,9 +61,9 @@ module RSpec
           alias open3_safe_escape escape
         end
 
-        def run_locations(locations, *capture_args)
+        def run_locations(*capture_args)
           @server.capture_run_results(*capture_args) do
-            run_command command_for(locations)
+            run_command command_for([])
           end
         end
 

data/lib/rspec/core/bisect/server.rb

@@ -20,8 +20,9 @@ module RSpec
           server.stop
         end
 
-        def capture_run_results(expected_failures=[])
+        def capture_run_results(files_or_directories_to_run=[], expected_failures=[])
           self.expected_failures  = expected_failures
+          self.files_or_directories_to_run = files_or_directories_to_run
           self.latest_run_results = nil
           run_output = yield
           latest_run_results || raise_bisect_failed(run_output)
@@ -49,6 +50,9 @@ module RSpec
         # Set via DRb by the BisectFormatter with the results of the run.
         attr_accessor :latest_run_results
 
+        # Fetched via DRb to tell clients which files to run
+        attr_accessor :files_or_directories_to_run
+
       private
 
         def raise_bisect_failed(run_output)

data/lib/rspec/core/configuration.rb

@@ -327,6 +327,59 @@ module RSpec
         )
       end
 
+      # @macro define_reader
+      # Configures how RSpec treats metadata passed as part of a shared example
+      # group definition. For example, given this shared example group definition:
+      #
+      #     RSpec.shared_context "uses DB", :db => true do
+      #       around(:example) do |ex|
+      #         MyORM.transaction(:rollback => true, &ex)
+      #       end
+      #     end
+      #
+      # ...there are two ways RSpec can treat the `:db => true` metadata, each
+      # of which has a corresponding config option:
+      #
+      # 1. `:trigger_inclusion`: this shared context will be implicitly included
+      #    in any groups (or examples) that have `:db => true` metadata.
+      # 2. `:apply_to_host_groups`: the metadata will be inherited by the metadata
+      #    hash of all host groups and examples.
+      #
+      # `:trigger_inclusion` is the legacy behavior from before RSpec 3.5 but should
+      # be considered deprecated. Instead, you can explicitly include a group with
+      # `include_context`:
+      #
+      #     RSpec.describe "My model" do
+      #       include_context "uses DB"
+      #     end
+      #
+      # ...or you can configure RSpec to include the context based on matching metadata
+      # using an API that mirrors configured module inclusion:
+      #
+      #     RSpec.configure do |rspec|
+      #       rspec.include_context "uses DB", :db => true
+      #     end
+      #
+      # `:apply_to_host_groups` is a new feature of RSpec 3.5 and will be the only
+      # supported behavior in RSpec 4.
+      #
+      # @overload shared_context_metadata_behavior
+      #   @return [:trigger_inclusion, :apply_to_host_groups] the configured behavior
+      # @overload shared_context_metadata_behavior=(value)
+      #   @param value [:trigger_inclusion, :apply_to_host_groups] sets the configured behavior
+      define_reader :shared_context_metadata_behavior
+      # @see shared_context_metadata_behavior
+      def shared_context_metadata_behavior=(value)
+        case value
+        when :trigger_inclusion, :apply_to_host_groups
+          @shared_context_metadata_behavior = value
+        else
+          raise ArgumentError, "Cannot set `RSpec.configuration." \
+            "shared_context_metadata_behavior` to `#{value.inspect}`. Only " \
+            "`:trigger_inclusion` and `:apply_to_host_groups` are valid values."
+        end
+      end
+
       # Record the start time of the spec suite to measure load time.
       add_setting :start_time
 
@@ -352,6 +405,7 @@ module RSpec
       attr_reader :backtrace_formatter, :ordering_manager, :loaded_spec_files
 
       # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
       def initialize
         # rubocop:disable Style/GlobalVars
         @start_time = $_rspec_core_load_started_at || ::RSpec::Core::Time.now
@@ -398,9 +452,11 @@ module RSpec
         @threadsafe = true
         @max_displayed_failure_line_count = 10
         @world = World::Null
+        @shared_context_metadata_behavior = :trigger_inclusion
 
         define_built_in_hooks
       end
+      # rubocop:enable Metrics/MethodLength
       # rubocop:enable Metrics/AbcSize
 
       # @private
@@ -1153,7 +1209,7 @@ module RSpec
       #     end
       #
       #     RSpec.configure do |config|
-      #       config.include(UserHelpers) # included in all modules
+      #       config.include(UserHelpers) # included in all groups
       #       config.include(AuthenticationHelpers, :type => :request)
       #     end
       #
@@ -1172,12 +1228,55 @@ module RSpec
       #   example has a singleton example group containing just the one
       #   example.
       #
+      # @see #include_context
       # @see #extend
       # @see #prepend
       def include(mod, *filters)
-        meta = Metadata.build_hash_from(filters, :warn_about_example_group_filtering)
-        @include_modules.append(mod, meta)
-        on_existing_matching_groups(meta) { |group| safe_include(mod, group) }
+        define_mixed_in_module(mod, filters, @include_modules, :include) do |group|
+          safe_include(mod, group)
+        end
+      end
+
+      # Tells RSpec to include the named shared example group in example groups.
+      # Use `filters` to constrain the groups or examples in which to include
+      # the example group.
+      #
+      # @example
+      #
+      #     RSpec.shared_context "example users" do
+      #       let(:admin_user) { create_user(:admin) }
+      #       let(:guest_user) { create_user(:guest) }
+      #     end
+      #
+      #     RSpec.configure do |config|
+      #       config.include_context "example users", :type => :request
+      #     end
+      #
+      #     RSpec.describe "The admin page", :type => :request do
+      #       it "can be viewed by admins" do
+      #         login_with admin_user
+      #         get "/admin"
+      #         expect(response).to be_ok
+      #       end
+      #
+      #       it "cannot be viewed by guests" do
+      #         login_with guest_user
+      #         get "/admin"
+      #         expect(response).to be_forbidden
+      #       end
+      #     end
+      #
+      # @note Filtered context inclusions can also be applied to
+      #   individual examples that have matching metadata. Just like
+      #   Ruby's object model is that every object has a singleton class
+      #   which has only a single instance, RSpec's model is that every
+      #   example has a singleton example group containing just the one
+      #   example.
+      #
+      # @see #include
+      def include_context(shared_group_name, *filters)
+        shared_module = world.shared_example_group_registry.find([:main], shared_group_name)
+        include shared_module, *filters
       end
 
       # Tells RSpec to extend example groups with `mod`. Methods defined in
@@ -1211,9 +1310,9 @@ module RSpec
       # @see #include
       # @see #prepend
       def extend(mod, *filters)
-        meta = Metadata.build_hash_from(filters, :warn_about_example_group_filtering)
-        @extend_modules.append(mod, meta)
-        on_existing_matching_groups(meta) { |group| safe_extend(mod, group) }
+        define_mixed_in_module(mod, filters, @extend_modules, :extend) do |group|
+          safe_extend(mod, group)
+        end
       end
 
       if RSpec::Support::RubyFeatures.module_prepends_supported?
@@ -1250,9 +1349,9 @@ module RSpec
         # @see #include
         # @see #extend
         def prepend(mod, *filters)
-          meta = Metadata.build_hash_from(filters, :warn_about_example_group_filtering)
-          @prepend_modules.append(mod, meta)
-          on_existing_matching_groups(meta) { |group| safe_prepend(mod, group) }
+          define_mixed_in_module(mod, filters, @prepend_modules, :prepend) do |group|
+            safe_prepend(mod, group)
+          end
         end
       end
 
@@ -1261,6 +1360,8 @@ module RSpec
       # Used internally to extend a group with modules using `include`, `prepend` and/or
       # `extend`.
       def configure_group(group)
+        group.hooks.register_globals(group, hooks)
+
         configure_group_with group, @include_modules, :safe_include
         configure_group_with group, @extend_modules,  :safe_extend
         configure_group_with group, @prepend_modules, :safe_prepend
@@ -1270,7 +1371,8 @@ module RSpec
       #
       # Used internally to extend the singleton class of a single example's
       # example group instance with modules using `include` and/or `extend`.
-      def configure_example(example)
+      def configure_example(example, example_hooks)
+        example_hooks.register_global_singleton_context_hooks(example, hooks)
         singleton_group = example.example_group_instance.singleton_class
 
         # We replace the metadata so that SharedExampleGroupModule#included
@@ -1389,8 +1491,12 @@ module RSpec
 
       # @macro delegate_to_ordering_manager
       #
-      # Sets the default global order and, if order is `'rand:<seed>'`, also
-      # sets the seed.
+      # Sets the default global ordering strategy. By default this can be one
+      # of `:defined`, `:random`, but is customizable through the
+      # `register_ordering` API. If order is set to `'rand:<seed>'`,
+      # the seed will also be set.
+      #
+      # @see #register_ordering
       delegate_to_ordering_manager :order=
 
       # @macro delegate_to_ordering_manager
@@ -1412,13 +1518,32 @@ module RSpec
       #     end
       #   end
       #
-      #   describe MyClass, :order => :reverse do
+      #   RSpec.describe 'MyClass', :order => :reverse do
       #     # ...
       #   end
       #
       # @note Pass the symbol `:global` to set the ordering strategy that
       #   will be used to order the top-level example groups and any example
       #   groups that do not have declared `:order` metadata.
+      #
+      # @example
+      #   RSpec.configure do |rspec|
+      #     rspec.register_ordering :global do |examples|
+      #       acceptance, other = examples.partition do |example|
+      #         example.metadata[:type] == :acceptance
+      #       end
+      #       other + acceptance
+      #     end
+      #   end
+      #
+      #   RSpec.describe 'MyClass', :type => :acceptance do
+      #     # will run last
+      #   end
+      #
+      #   RSpec.describe 'MyClass' do
+      #     # will run first
+      #   end
+      #
       delegate_to_ordering_manager :register_ordering
 
       # @private
@@ -1759,7 +1884,7 @@ module RSpec
         files = FlatMap.flat_map(paths_to_check(paths)) do |path|
           path = path.gsub(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
           File.directory?(path) ? gather_directories(path) : extract_location(path)
-        end.sort.uniq
+        end.uniq
 
         return files unless only_failures?
         relative_files = files.map { |f| Metadata.relative_path(File.expand_path f) }
@@ -1779,11 +1904,12 @@ module RSpec
       def gather_directories(path)
         include_files = get_matching_files(path, pattern)
         exclude_files = get_matching_files(path, exclude_pattern)
-        (include_files - exclude_files).sort.uniq
+        (include_files - exclude_files).uniq
       end
 
       def get_matching_files(path, pattern)
-        Dir[file_glob_from(path, pattern)].map { |file| File.expand_path(file) }
+        raw_files = Dir[file_glob_from(path, pattern)]
+        raw_files.map { |file| File.expand_path(file) }.sort
       end
 
       def file_glob_from(path, pattern)
@@ -1823,7 +1949,7 @@ module RSpec
         end
 
         return [] if path == default_path
-        path
+        File.expand_path(path)
       end
 
       def command
@@ -1932,6 +2058,16 @@ module RSpec
         end
         # :nocov:
       end
+
+      def define_mixed_in_module(mod, filters, mod_list, config_method, &block)
+        unless Module === mod
+          raise TypeError, "`RSpec.configuration.#{config_method}` expects a module but got: #{mod.inspect}"
+        end
+
+        meta = Metadata.build_hash_from(filters, :warn_about_example_group_filtering)
+        mod_list.append(mod, meta)
+        on_existing_matching_groups(meta, &block)
+      end
     end
     # rubocop:enable Metrics/ClassLength
   end

data/lib/rspec/core/example.rb

@@ -142,6 +142,13 @@ module RSpec
                     new_metadata, new_metadata[:block])
       end
 
+      # @private
+      def update_inherited_metadata(updates)
+        metadata.update(updates) do |_key, existing_example_value, _new_inherited_value|
+          existing_example_value
+        end
+      end
+
       # @attr_reader
       #
       # Returns the first exception raised in the context of running this
@@ -229,8 +236,7 @@ module RSpec
       def run(example_group_instance, reporter)
         @example_group_instance = example_group_instance
         @reporter = reporter
-        hooks.register_global_singleton_context_hooks(self, RSpec.configuration.hooks)
-        RSpec.configuration.configure_example(self)
+        RSpec.configuration.configure_example(self, hooks)
         RSpec.current_example = self
 
         start(reporter)

data/lib/rspec/core/example_group.rb

@@ -33,6 +33,8 @@ module RSpec
       include Pending
       extend SharedExampleGroup
 
+      # Define a singleton method for the singleton class (remove the method if
+      # it's already been defined).
       # @private
       def self.idempotently_define_singleton_method(name, &definition)
         (class << self; self; end).module_exec do
@@ -362,16 +364,16 @@ module RSpec
 
       # @private
       def self.find_and_eval_shared(label, name, inclusion_location, *args, &customization_block)
-        shared_block = RSpec.world.shared_example_group_registry.find(parent_groups, name)
+        shared_module = RSpec.world.shared_example_group_registry.find(parent_groups, name)
 
-        unless shared_block
+        unless shared_module
           raise ArgumentError, "Could not find shared #{label} #{name.inspect}"
         end
 
-        SharedExampleGroupInclusionStackFrame.with_frame(name, Metadata.relative_path(inclusion_location)) do
-          module_exec(*args, &shared_block)
-          module_exec(&customization_block) if customization_block
-        end
+        shared_module.include_in(
+          self, Metadata.relative_path(inclusion_location),
+          args, customization_block
+        )
       end
 
       # @!endgroup
@@ -424,7 +426,6 @@ module RSpec
 
         @currently_executing_a_context_hook = false
 
-        hooks.register_globals(self, RSpec.configuration.hooks)
         RSpec.configuration.configure_group(self)
       end
 
@@ -688,6 +689,17 @@ module RSpec
         # :nocov:
       end
 
+      # @private
+      def self.update_inherited_metadata(updates)
+        metadata.update(updates) do |_key, existing_group_value, _new_inherited_value|
+          existing_group_value
+        end
+
+        RSpec.configuration.configure_group(self)
+        examples.each { |ex| ex.update_inherited_metadata(updates) }
+        children.each { |group| group.update_inherited_metadata(updates) }
+      end
+
       # Raised when an RSpec API is called in the wrong scope, such as `before`
       # being called from within an example rather than from within an example
       # group block.

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

@@ -16,12 +16,13 @@ module RSpec
                             :example_failed, :example_passed, :example_pending
 
         def initialize(_output)
-          port                = RSpec.configuration.drb_port
-          drb_uri             = "druby://localhost:#{port}"
-          @all_example_ids    = []
+          port = RSpec.configuration.drb_port
+          drb_uri = "druby://localhost:#{port}"
+          @all_example_ids = []
           @failed_example_ids = []
-          @bisect_server      = DRbObject.new_with_uri(drb_uri)
+          @bisect_server = DRbObject.new_with_uri(drb_uri)
           @remaining_failures = []
+          RSpec.configuration.files_or_directories_to_run = @bisect_server.files_or_directories_to_run
         end
 
         def start(_notification)

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

@@ -34,8 +34,7 @@ module RSpec
         end
 
         def example_failed(failure)
-          output.puts failure_output(failure.example,
-                                     failure.example.execution_result.exception)
+          output.puts failure_output(failure.example)
         end
 
       private
@@ -50,7 +49,7 @@ module RSpec
                             :pending)
         end
 
-        def failure_output(example, _exception)
+        def failure_output(example)
           ConsoleCodes.wrap("#{current_indentation}#{example.description.strip} " \
                             "(FAILED - #{next_failure_index})",
                             :failure)

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

@@ -204,7 +204,13 @@ module RSpec
             return ["Unable to find matching line from backtrace"]
           end
 
-          file_path, line_number = matching_line.match(/(.+?):(\d+)(|:\d+)/)[1..2]
+          file_and_line_number = matching_line.match(/(.+?):(\d+)(|:\d+)/)
+
+          unless file_and_line_number
+            return ["Unable to infer file and line number from backtrace"]
+          end
+
+          file_path, line_number = file_and_line_number[1..2]
           max_line_count = RSpec.configuration.max_displayed_failure_line_count
           lines = SnippetExtractor.extract_expression_lines_at(file_path, line_number.to_i, max_line_count)
           RSpec.world.source_cache.syntax_highlighter.highlight(lines)

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

@@ -71,7 +71,7 @@ module RSpec
           exception = failure.exception
           exception_details = if exception
                                 {
-                                  :message => exception.message,
+                                  :message => failure.message_lines.join("\n"),
                                   :backtrace => failure.formatted_backtrace.join("\n")
                                 }
                               end

data/lib/rspec/core/metadata_filter.rb

@@ -34,6 +34,14 @@ module RSpec
           end
         end
 
+        # @private
+        def silence_metadata_example_group_deprecations
+          RSpec::Support.thread_local_data[:silence_metadata_example_group_deprecations] = true
+          yield
+        ensure
+          RSpec::Support.thread_local_data.delete(:silence_metadata_example_group_deprecations)
+        end
+
       private
 
         def filter_applies_to_any_value?(key, value, metadata)
@@ -72,13 +80,6 @@ module RSpec
           return false unless Hash === subhash || HashImitatable === subhash
           value.all? { |k, v| filter_applies?(k, v, subhash) }
         end
-
-        def silence_metadata_example_group_deprecations
-          RSpec::Support.thread_local_data[:silence_metadata_example_group_deprecations] = true
-          yield
-        ensure
-          RSpec::Support.thread_local_data.delete(:silence_metadata_example_group_deprecations)
-        end
       end
     end
 
@@ -202,9 +203,20 @@ module RSpec
         end
 
         def applicable_metadata_from(metadata)
-          @applicable_keys.inject({}) do |hash, key|
-            hash[key] = metadata[key] if metadata.key?(key)
-            hash
+          MetadataFilter.silence_metadata_example_group_deprecations do
+            @applicable_keys.inject({}) do |hash, key|
+              # :example_group is treated special here because...
+              # - In RSpec 2, example groups had an `:example_group` key
+              # - In RSpec 3, that key is deprecated (it was confusing!).
+              # - The key is not technically present in an example group metadata hash
+              #   (and thus would fail the `metadata.key?(key)` check) but a value
+              #   is provided when accessed via the hash's `default_proc`
+              # - Thus, for backwards compatibility, we have to explicitly check
+              #   for `:example_group` here if it is one of the keys being used to
+              #   filter.
+              hash[key] = metadata[key] if metadata.key?(key) || key == :example_group
+              hash
+            end
           end
         end
 

data/lib/rspec/core/project_initializer/spec/spec_helper.rb

@@ -40,6 +40,13 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.
 =begin

data/lib/rspec/core/shared_example_group.rb

@@ -5,9 +5,13 @@ module RSpec
     # eval'd when the `SharedExampleGroupModule` instance is included in an example
     # group.
     class SharedExampleGroupModule < Module
-      def initialize(description, definition)
+      # @private
+      attr_reader :definition
+
+      def initialize(description, definition, metadata)
         @description = description
         @definition  = definition
+        @metadata    = metadata
       end
 
       # Provides a human-readable representation of this module.
@@ -21,8 +25,16 @@ module RSpec
       # including example group.
       def included(klass)
         inclusion_line = klass.metadata[:location]
+        include_in klass, inclusion_line, [], nil
+      end
+
+      # @private
+      def include_in(klass, inclusion_line, args, customization_block)
+        klass.update_inherited_metadata(@metadata) unless @metadata.empty?
+
         SharedExampleGroupInclusionStackFrame.with_frame(@description, inclusion_line) do
-          klass.class_exec(&@definition)
+          klass.class_exec(*args, &@definition)
+          klass.class_exec(&customization_block) if customization_block
         end
       end
     end
@@ -141,17 +153,21 @@ module RSpec
       # @private
       class Registry
         def add(context, name, *metadata_args, &block)
-          ensure_block_has_source_location(block) { CallerFilter.first_non_rspec_line }
+          if RSpec.configuration.shared_context_metadata_behavior == :trigger_inclusion
+            return legacy_add(context, name, *metadata_args, &block)
+          end
 
-          if valid_name?(name)
-            warn_if_key_taken context, name, block
-            shared_example_groups[context][name] = block
-          else
-            metadata_args.unshift name
+          unless valid_name?(name)
+            raise ArgumentError, "Shared example group names can only be a string, " \
+                                 "symbol or module but got: #{name.inspect}"
           end
 
-          return if metadata_args.empty?
-          RSpec.configuration.include SharedExampleGroupModule.new(name, block), *metadata_args
+          ensure_block_has_source_location(block) { CallerFilter.first_non_rspec_line }
+          warn_if_key_taken context, name, block
+
+          metadata = Metadata.build_hash_from(metadata_args)
+          shared_module = SharedExampleGroupModule.new(name, block, metadata)
+          shared_example_groups[context][name] = shared_module
         end
 
         def find(lookup_contexts, name)
@@ -165,6 +181,25 @@ module RSpec
 
       private
 
+        # TODO: remove this in RSpec 4. This exists only to support
+        # `config.shared_context_metadata_behavior == :trigger_inclusion`,
+        # the legacy behavior of shared context metadata, which we do
+        # not want to support in RSpec 4.
+        def legacy_add(context, name, *metadata_args, &block)
+          ensure_block_has_source_location(block) { CallerFilter.first_non_rspec_line }
+          shared_module = SharedExampleGroupModule.new(name, block, {})
+
+          if valid_name?(name)
+            warn_if_key_taken context, name, block
+            shared_example_groups[context][name] = shared_module
+          else
+            metadata_args.unshift name
+          end
+
+          return if metadata_args.empty?
+          RSpec.configuration.include shared_module, *metadata_args
+        end
+
         def shared_example_groups
           @shared_example_groups ||= Hash.new { |hash, context| hash[context] = {} }
         end
@@ -177,13 +212,13 @@ module RSpec
         end
 
         def warn_if_key_taken(context, key, new_block)
-          existing_block = shared_example_groups[context][key]
+          existing_module = shared_example_groups[context][key]
 
-          return unless existing_block
+          return unless existing_module
 
           RSpec.warn_with <<-WARNING.gsub(/^ +\|/, ''), :call_site => nil
             |WARNING: Shared example group '#{key}' has been previously defined at:
-            |  #{formatted_location existing_block}
+            |  #{formatted_location existing_module.definition}
             |...and you are now defining it at:
             |  #{formatted_location new_block}
             |The new definition will overwrite the original one.

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.beta3'
+      STRING = '3.5.0.beta4'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.5.0.beta3
+  version: 3.5.0.beta4
 platform: ruby
 authors:
 - Steven Baker
@@ -46,7 +46,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -54,14 +54,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta3
+        version: 3.5.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta3
+        version: 3.5.0.beta4
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -279,9 +279,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.5.0.beta3
+summary: rspec-core-3.5.0.beta4
 test_files: []
 has_rdoc: