rspec-core 2.99.2 → 3.0.0.beta1

data/lib/rspec/core/configuration_options.rb

@@ -8,14 +8,9 @@ module RSpec
       attr_reader :options
 
       def initialize(args)
-        @args = args.dup
-        if @args.include?("--default_path")
-          @args[@args.index("--default_path")] = "--default-path"
-        end
-
-        if @args.include?("--line_number")
-          @args[@args.index("--line_number")] = "--line-number"
-        end
+        @args = args.map {|a|
+          a.sub("default_path", "default-path").sub("line_number",  "line-number")
+        }
       end
 
       def configure(config)
@@ -29,11 +24,16 @@ module RSpec
       end
 
       def parse_options
-        @options ||= extract_filters_from(*all_configs).inject do |merged, pending|
-          merged.merge(pending) { |key, oldval, newval|
-            MERGED_OPTIONS.include?(key) ? oldval + newval : newval
+        @options = (file_options << command_line_options << env_options).
+          each {|opts|
+            filter_manager.include opts.delete(:inclusion_filter) if opts.has_key?(:inclusion_filter)
+            filter_manager.exclude opts.delete(:exclusion_filter) if opts.has_key?(:exclusion_filter)
+          }.
+          inject {|h, opts|
+            h.merge(opts) {|k, oldval, newval|
+              [:libs, :requires].include?(k) ? oldval + newval : newval
+            }
           }
-        end
       end
 
       def drb_argv
@@ -46,17 +46,15 @@ module RSpec
 
     private
 
-      NON_FORCED_OPTIONS = [
-        :debug, :requires, :profile, :drb, :libs, :files_or_directories_to_run,
+      UNFORCED_OPTIONS = [
+        :requires, :profile, :drb, :libs, :files_or_directories_to_run,
         :line_numbers, :full_description, :full_backtrace, :tty
       ].to_set
 
-      MERGED_OPTIONS = [:requires, :libs].to_set
-
       UNPROCESSABLE_OPTIONS = [:libs, :formatters, :requires].to_set
 
       def force?(key)
-        !NON_FORCED_OPTIONS.include?(key)
+        !UNFORCED_OPTIONS.include?(key)
       end
 
       def order(keys, *ordered)
@@ -78,17 +76,6 @@ module RSpec
         options[:formatters].each { |pair| config.add_formatter(*pair) } if options[:formatters]
       end
 
-      def extract_filters_from(*configs)
-        configs.compact.each do |config|
-          filter_manager.include config.delete(:inclusion_filter) if config.has_key?(:inclusion_filter)
-          filter_manager.exclude config.delete(:exclusion_filter) if config.has_key?(:exclusion_filter)
-        end
-      end
-
-      def all_configs
-        @all_configs ||= file_options << command_line_options << env_options
-      end
-
       def file_options
         custom_options_file ? [custom_options] : [global_options, project_options, local_options]
       end
@@ -124,7 +111,7 @@ module RSpec
       def args_from_options_file(path)
         return [] unless path && File.exist?(path)
         config_string = options_file_as_erb_string(path)
-        config_string.split(/\n+/).map {|l| Shellwords.shellwords(l) }.flatten
+        FlatMap.flat_map(config_string.split(/\n+/), &:shellsplit)
       end
 
       def options_file_as_erb_string(path)
@@ -147,7 +134,7 @@ module RSpec
         begin
           File.join(File.expand_path("~"), ".rspec")
         rescue ArgumentError
-          warn "Unable to find ~/.rspec because the HOME environment variable is not set"
+          RSpec.warning "Unable to find ~/.rspec because the HOME environment variable is not set"
           nil
         end
       end

data/lib/rspec/core/example.rb

@@ -44,7 +44,7 @@ module RSpec
       delegate_to_metadata :full_description, :execution_result, :file_path, :pending, :location
 
       # Returns the string submitted to `example` or its aliases (e.g.
-      # `specify`, `it`, etc).  If no string is submitted (e.g. `it { is_expected.to
+      # `specify`, `it`, etc).  If no string is submitted (e.g. `it { should
       # do_something }`) it returns the message generated by the matcher if
       # there is one, otherwise returns a message including the location of the
       # example.
@@ -85,8 +85,6 @@ module RSpec
 
       # @deprecated access options via metadata instead
       def options
-        RSpec.deprecate("`RSpec::Core::Example#options`",
-                        :replacement => "`RSpec::Core::Example#metadata`")
         @options
       end
 
@@ -109,17 +107,16 @@ module RSpec
         start(reporter)
 
         begin
-          unless pending
+          unless pending || RSpec.configuration.dry_run?
             with_around_each_hooks do
               begin
                 run_before_each
-                @example_group_instance.instance_eval_with_args(self, &@example_block)
-              rescue Pending::SkipDeclaredInExample => e
+                @example_group_instance.instance_exec(self, &@example_block)
+              rescue Pending::PendingDeclaredInExample => e
                 @pending_declared_in_example = e.message
               rescue Exception => e
                 set_exception(e)
               ensure
-                assign_generated_description
                 run_after_each
               end
             end
@@ -131,6 +128,12 @@ module RSpec
             @example_group_instance.instance_variable_set(ivar, nil)
           end
           @example_group_instance = nil
+
+          begin
+            assign_generated_description
+          rescue Exception => e
+            set_exception(e, "while assigning the example description")
+          end
         end
 
         finish(reporter)
@@ -138,16 +141,8 @@ module RSpec
         RSpec.current_example = nil
       end
 
-      # @api private
-      #
-      # Wraps the example block in a Proc so it can invoked using `run` or
-      # `call` in [around](../Hooks#around-instance_method) hooks.
-      def self.procsy(metadata, &proc)
-        proc.extend(Procsy).with(metadata)
-      end
-
-      # Used to extend a `Proc` with behavior that makes it look something like
-      # an {Example} in an {Hooks#around around} hook.
+      # Wraps a `Proc` and exposes a `run` method for use in {Hooks#around
+      # around} hooks.
       #
       # @note Procsy, itself, is not a public API, but we're documenting it
       #   here to document how to interact with the object yielded to an
@@ -156,32 +151,30 @@ module RSpec
       # @example
       #
       #     RSpec.configure do |c|
-      #       c.around do |ex| # ex is a Proc extended with Procsy
+      #       c.around do |ex| # Procsy which wraps the example
       #         if ex.metadata[:key] == :some_value && some_global_condition
       #           raise "some message"
       #         end
       #         ex.run         # run delegates to ex.call
       #       end
       #     end
-      module Procsy
+      class Procsy
         # The `metadata` of the {Example} instance.
         attr_reader :metadata
 
-        # @api private
-        # @param [Proc]
-        # Adds a `run` method to the extended Proc, allowing it to be invoked
-        # in an [around](../Hooks#around-instance_method) hook using either
-        # `run` or `call`.
-        def self.extended(proc)
-          # @api public
-          # Foo bar
-          def proc.run; call; end
+        Proc.public_instance_methods(false).each do |name|
+          define_method(name) { |*a, &b| @proc.__send__(name, *a, &b) }
         end
+        alias run call
 
-        # @api private
-        def with(metadata)
+        def initialize(metadata, &block)
           @metadata = metadata
-          self
+          @proc = block
+        end
+
+        # @api private
+        def wrap(&block)
+          self.class.new(metadata, &block)
         end
       end
 
@@ -232,13 +225,13 @@ An error occurred #{context}
       end
 
       # @private
-      def instance_eval_with_rescue(context = nil, &block)
-        @example_group_instance.instance_eval_with_rescue(self, context, &block)
+      def instance_exec_with_rescue(context = nil, &block)
+        @example_group_instance.instance_exec_with_rescue(self, context, &block)
       end
 
       # @private
-      def instance_eval_with_args(*args, &block)
-        @example_group_instance.instance_eval_with_args(*args, &block)
+      def instance_exec(*args, &block)
+        @example_group_instance.instance_exec(*args, &block)
       end
 
     private
@@ -247,7 +240,7 @@ An error occurred #{context}
         if around_each_hooks.empty?
           yield
         else
-          @example_group_class.run_around_each_hooks(self, Example.procsy(metadata, &block))
+          @example_group_class.run_around_each_hooks(self, Procsy.new(metadata, &block))
         end
       rescue Exception => e
         set_exception(e, "in an around(:each) hook")
@@ -308,9 +301,6 @@ An error occurred #{context}
         if metadata[:description_args].empty? and !pending?
           metadata[:description_args] << RSpec::Matchers.generated_description
         end
-      rescue Exception => e
-        set_exception(e, "while assigning the example description")
-      ensure
         RSpec::Matchers.clear_generated_description
       end
 

data/lib/rspec/core/example_group.rb

@@ -13,14 +13,10 @@ module RSpec
     # which serves as a wrapper for an instance of the ExampleGroup in which it
     # is declared.
     class ExampleGroup
-      extend  MetadataHashBuilder::WithDeprecationWarning
-      extend  Extensions::ModuleEvalWithArgs
       extend  Hooks
 
       include MemoizedHelpers
-      include Extensions::InstanceEvalWithArgs
       include Pending
-      include SharedExampleGroup
       extend SharedExampleGroup
 
       # @private
@@ -49,166 +45,116 @@ module RSpec
         end
 
         delegate_to_metadata :described_class, :file_path
-
+        alias_method :display_name, :description
         # @private
-        def display_name
-          RSpec.deprecate('`RSpec::Core::ExampleGroup.display_name`',
-                          :replacement => "`RSpec::Core::ExampleGroup.description`")
-          description
-        end
+        alias_method :describes, :described_class
 
         # @private
-        def describes
-          RSpec.deprecate('`RSpec::Core::ExampleGroup.describes`',
-                          :replacement => "`RSpec::Core::ExampleGroup.described_class`")
-          described_class
-        end
-      end
-
-      # @private
-      # @macro [attach] define_example_method
-      #   @param [String] name
-      #   @param [Hash] extra_options
-      #   @param [Block] implementation
-      #   @yield [Example] the example object
-      def self.define_example_method(name, extra_options={})
-        module_eval(<<-END_RUBY, __FILE__, __LINE__)
-          def self.#{name}(desc=nil, *args, &block)
-            if #{name.inspect} == :pending
-              RSpec.warn_deprecation(<<-EOS.gsub(/^\s+\\|/, ''))
-                |The semantics of `RSpec::Core::ExampleGroup.pending` are changing in RSpec 3.
-                |In RSpec 2.x, it caused the example to be skipped. In RSpec 3, the example will
-                |still be run but is expected to fail, and will be marked as a failure (rather
-                |than as pending) if the example passes, just like how `pending` with a block
-                |from within an example already works.
-                |
-                |To keep the same skip semantics, change `pending` to `skip`.  Otherwise, if you
-                |want the new RSpec 3 behavior, you can safely ignore this warning and continue
-                |to upgrade to RSpec 3 without addressing it.
-                |
-                |Called from \#{CallerFilter.first_non_rspec_line}.
-                |
-              EOS
-            end
-            options = build_metadata_hash_from(args)
+        # @macro [attach] define_example_method
+        #   @param [String] name
+        #   @param [Hash] extra_options
+        #   @param [Block] implementation
+        #   @yield [Example] the example object
+        def self.define_example_method(name, extra_options={})
+          define_method(name) do |*all_args, &block|
+            desc, *args = *all_args
+            options = Metadata.build_hash_from(args)
             options.update(:pending => RSpec::Core::Pending::NOT_YET_IMPLEMENTED) unless block
-            # Backport from RSpec 3 to assist with upgrading
-            options.update(:pending => options[:skip]) if options[:skip]
-            options.update(#{extra_options.inspect})
+            options.update(extra_options)
             examples << RSpec::Core::Example.new(self, desc, options, block)
             examples.last
           end
-        END_RUBY
-      end
+        end
 
-      # Defines an example within a group.
-      # @example
-      #   example do
-      #   end
-      #
-      #   example "does something" do
-      #   end
-      #
-      #   example "does something", :with => 'additional metadata' do
-      #   end
-      #
-      #   example "does something" do |ex|
-      #     # ex is the Example object that evals this block
-      #   end
-      define_example_method :example
-      # Defines an example within a group.
-      # @example
-      define_example_method :it
-      # Defines an example within a group.
-      # This is here primarily for backward compatibility with early versions
-      # of RSpec which used `context` and `specify` instead of `describe` and
-      # `it`.
-      define_example_method :specify
-
-      # Shortcut to define an example with `:focus` => true
-      # @see example
-      define_example_method :focus,   :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
-      # @see example
-      define_example_method :pending,  :pending => true
-      # Shortcut to define an example with :pending => true
-      # Backported from RSpec 3 to aid migration.
-      # @see example
-      define_example_method :skip,     :pending => true
-      # Shortcut to define an example with :pending => 'Temporarily disabled with xexample'
-      # @see example
-      define_example_method :xexample, :pending => 'Temporarily disabled with xexample'
-      # Shortcut to define an example with :pending => 'Temporarily disabled with xit'
-      # @see example
-      define_example_method :xit,      :pending => 'Temporarily disabled with xit'
-      # Shortcut to define an example with :pending => 'Temporarily disabled with xspecify'
-      # @see example
-      define_example_method :xspecify, :pending => 'Temporarily disabled with xspecify'
-
-      # Shortcut to define an example with `:focus` => true
-      # @see example
-      def self.focused(desc=nil, *args, &block)
-        RSpec.deprecate("`RSpec::Core::ExampleGroup.focused`",
-                        :replacement => "`RSpec::Core::ExampleGroup.focus`")
-
-        metadata = Hash === args.last ? args.pop : {}
-        metadata.merge!(:focus => true, :focused => true)
-        args << metadata
-
-        example(desc, *args, &block)
-      end
-
-      # Works like `alias_method :name, :example` with the added benefit of
-      # assigning default metadata to the generated example.
-      #
-      # @note Use with caution. This extends the language used in your
-      #   specs, but does not add any additional documentation.  We use this
-      #   in rspec to define methods like `focus` and `xit`, but we also add
-      #   docs for those methods.
-      def self.alias_example_to name, extra={}
-        RSpec.deprecate("`RSpec::Core::ExampleGroup.alias_example_to`",
-                        :replacement => "`RSpec::Core::Configuration#alias_example_to`")
-        define_example_method name, extra
-      end
+        # Defines an example within a group.
+        # @example
+        #   example do
+        #   end
+        #
+        #   example "does something" do
+        #   end
+        #
+        #   example "does something", :with => 'additional metadata' do
+        #   end
+        #
+        #   example "does something" do |ex|
+        #     # ex is the Example object that evals this block
+        #   end
+        define_example_method :example
+        # Defines an example within a group.
+        # @example
+        define_example_method :it
+        # Defines an example within a group.
+        # This is here primarily for backward compatibility with early versions
+        # of RSpec which used `context` and `specify` instead of `describe` and
+        # `it`.
+        define_example_method :specify
+
+        # Shortcut to define an example with `:focus` => true
+        # @see example
+        define_example_method :focus,   :focused => true, :focus => true
+        # Shortcut to define an example with `:focus` => true
+        # @see example
+        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
+        # @see example
+        define_example_method :pending,  :pending => true
+        # Shortcut to define an example with :pending => 'Temporarily disabled with xexample'
+        # @see example
+        define_example_method :xexample, :pending => 'Temporarily disabled with xexample'
+        # Shortcut to define an example with :pending => 'Temporarily disabled with xit'
+        # @see example
+        define_example_method :xit,      :pending => 'Temporarily disabled with xit'
+        # Shortcut to define an example with :pending => 'Temporarily disabled with xspecify'
+        # @see example
+        define_example_method :xspecify, :pending => 'Temporarily disabled with xspecify'
+
+        # Works like `alias_method :name, :example` with the added benefit of
+        # assigning default metadata to the generated example.
+        #
+        # @note Use with caution. This extends the language used in your
+        #   specs, but does not add any additional documentation.  We use this
+        #   in rspec to define methods like `focus` and `xit`, but we also add
+        #   docs for those methods.
+        def alias_example_to name, extra={}
+          (class << self; self; end).define_example_method name, extra
+        end
 
-      # @private
-      # @macro [attach] define_nested_shared_group_method
-      #
-      #   @see SharedExampleGroup
-      def self.define_nested_shared_group_method(new_name, report_label=nil)
-        module_eval(<<-END_RUBY, __FILE__, __LINE__)
-          def self.#{new_name}(name, *args, &customization_block)
-            group = describe("#{report_label || "it should behave like"} \#{name}") do
+        # @private
+        # @macro [attach] define_nested_shared_group_method
+        #
+        #   @see SharedExampleGroup
+        def self.define_nested_shared_group_method(new_name, report_label="it should behave like")
+          define_method(new_name) do |name, *args, &customization_block|
+            group = describe("#{report_label} #{name}") do
               find_and_eval_shared("examples", name, *args, &customization_block)
             end
             group.metadata[:shared_group_name] = name
             group
           end
-        END_RUBY
-      end
+        end
 
-      # Generates a nested example group and includes the shared content
-      # mapped to `name` in the nested group.
-      define_nested_shared_group_method :it_behaves_like, "behaves like"
-      # Generates a nested example group and includes the shared content
-      # mapped to `name` in the nested group.
-      define_nested_shared_group_method :it_should_behave_like
+        # Generates a nested example group and includes the shared content
+        # mapped to `name` in the nested group.
+        define_nested_shared_group_method :it_behaves_like, "behaves like"
+        # Generates a nested example group and includes the shared content
+        # mapped to `name` in the nested group.
+        define_nested_shared_group_method :it_should_behave_like
 
-      # Works like `alias_method :name, :it_behaves_like` with the added
-      # benefit of assigning default metadata to the generated example.
-      #
-      # @note Use with caution. This extends the language used in your
-      #   specs, but does not add any additional documentation.  We use this
-      #   in rspec to define `it_should_behave_like` (for backward
-      #   compatibility), but we also add docs for that method.
-      def self.alias_it_behaves_like_to name, *args, &block
-        RSpec.deprecate("`RSpec::Core::ExampleGroup.alias_it_behaves_like_to`",
-                        :replacement => "`RSpec::Core::Configuration#alias_it_behaves_like_to`")
-        define_nested_shared_group_method name, *args, &block
+        # Works like `alias_method :name, :it_behaves_like` with the added
+        # benefit of assigning default metadata to the generated example.
+        #
+        # @note Use with caution. This extends the language used in your
+        #   specs, but does not add any additional documentation.  We use this
+        #   in rspec to define `it_should_behave_like` (for backward
+        #   compatibility), but we also add docs for that method.
+        def alias_it_behaves_like_to name, *args, &block
+          (class << self; self; end).define_nested_shared_group_method name, *args, &block
+        end
       end
 
       # Includes shared content mapped to `name` directly in the group in which
@@ -229,46 +175,12 @@ module RSpec
         find_and_eval_shared("examples", name, *args, &block)
       end
 
-      if Proc.method_defined?(:parameters) # for >= 1.9
-        # Warn when submitting the name of more than one example group to
-        # include_examples, it_behaves_like, etc.
-        #
-        # Helpful when upgrading from rspec-1 (which supported multiple shared
-        # groups in one call) to rspec-2 (which does not).
-        #
-        # See https://github.com/rspec/rspec-core/issues/1066 for background.
-        def self.warn_unexpected_args(label, name, args, shared_block)
-          if !args.empty? && shared_block.parameters.count == 0
-            if shared_example_groups[args.first]
-              warn <<-WARNING
-shared #{label} support#{'s' if /context/ =~ label.to_s} the name of only one example group, received #{[name, *args].inspect}
-called from #{CallerFilter.first_non_rspec_line}"
-WARNING
-            else
-                warn <<-WARNING
-shared #{label} #{name.inspect} expected #{shared_block.arity} args, got #{args.inspect}
-called from #{CallerFilter.first_non_rspec_line}"
-WARNING
-            end
-          end
-        end
-      else
-        # no-op for Ruby < 1.9
-        #
-        # Ruby 1.8 reports lambda {}.arity == -1, so can't support this warning
-        # reliably
-        def self.warn_unexpected_args(*)
-        end
-      end
-
       # @private
       def self.find_and_eval_shared(label, name, *args, &customization_block)
         raise ArgumentError, "Could not find shared #{label} #{name.inspect}" unless
           shared_block = shared_example_groups[name]
 
-        warn_unexpected_args(label, name, args, shared_block)
-
-        module_eval_with_args(*args, &shared_block)
+        module_exec(*args, &shared_block)
         module_eval(&customization_block) if customization_block
       end
 
@@ -321,43 +233,14 @@ WARNING
       #
       # @see DSL#describe
       def self.describe(*args, &example_group_block)
-        @_subclass_count ||= 0
-        @_subclass_count += 1
-
-        if Symbol === args.first || Hash === args.first
-          description_arg_behavior_changing_in_rspec_3 = DescriptionBehaviorChange.new(
-            args.first, CallerFilter.first_non_rspec_line
-          )
-        end
-
         args << {} unless args.last.is_a?(Hash)
-        args.last.update(
-          :example_group_block => example_group_block,
-          :description_arg_behavior_changing_in_rspec_3 => description_arg_behavior_changing_in_rspec_3
-        )
-
-        # TODO 2010-05-05: Because we don't know if const_set is thread-safe
-        child = const_set(
-          "Nested_#{@_subclass_count}",
-          subclass(self, args, &example_group_block)
-        )
+        args.last.update(:example_group_block => example_group_block)
+
+        child = subclass(self, args, &example_group_block)
         children << child
         child
       end
 
-      DescriptionBehaviorChange = Struct.new(:arg, :call_site) do
-        def warning
-          <<-EOS.gsub(/^\s+\|/, '')
-            |The semantics of `describe <a #{arg.class.name}>` are changing in RSpec 3. In RSpec 2,
-            |this would be treated as metadata, but as the first `describe` argument,
-            |this will be treated as the described object (affecting the value of
-            |`described_class`) in RSpec 3. If you want this to be treated as metadata,
-            |pass a description as the first argument.
-            |(Example group defined at #{call_site})
-          EOS
-        end
-      end
-
       class << self
         alias_method :context, :describe
       end
@@ -366,6 +249,7 @@ WARNING
       def self.subclass(parent, args, &example_group_block)
         subclass = Class.new(parent)
         subclass.set_it_up(*args)
+        ExampleGroups.assign_const(subclass)
         subclass.module_eval(&example_group_block) if example_group_block
 
         # The LetDefinitions module must be included _after_ other modules
@@ -379,7 +263,7 @@ WARNING
 
       # @private
       def self.children
-        @children ||= [].extend(Extensions::Ordered::ExampleGroups)
+        @children ||= []
       end
 
       # @private
@@ -418,9 +302,10 @@ WARNING
         ensure_example_groups_are_configured
 
         symbol_description = args.shift if args.first.is_a?(Symbol)
-        args << build_metadata_hash_from(args)
+        args << Metadata.build_hash_from(args)
         args.unshift(symbol_description) if symbol_description
         @metadata = RSpec::Core::Metadata.new(superclass_metadata).process(*args)
+        @order = nil
         hooks.register_globals(self, RSpec.configuration.hooks)
         world.configure_group(self)
       end
@@ -494,7 +379,7 @@ WARNING
         begin
           run_before_all_hooks(new)
           result_for_this_group = run_examples(reporter)
-          results_for_descendants = children.ordered.map {|child| child.run(reporter)}.all?
+          results_for_descendants = ordering_strategy.order(children).map { |child| child.run(reporter) }.all?
           result_for_this_group && results_for_descendants
         rescue Exception => ex
           RSpec.wants_to_quit = true if fail_fast?
@@ -506,9 +391,25 @@ WARNING
         end
       end
 
+      # @private
+      def self.ordering_strategy
+        order = metadata.fetch(:order, :global)
+        registry = RSpec.configuration.ordering_registry
+
+        registry.fetch(order) do
+          warn <<-WARNING.gsub(/^ +\|/, '')
+            |WARNING: Ignoring unknown ordering specified using `:order => #{order.inspect}` metadata.
+            |         Falling back to configured global ordering.
+            |         Unrecognized ordering specified at: #{metadata[:example_group][:location]}
+          WARNING
+
+          registry.fetch(:global)
+        end
+      end
+
       # @private
       def self.run_examples(reporter)
-        filtered_examples.ordered.map do |example|
+        ordering_strategy.order(filtered_examples).map do |example|
           next if RSpec.wants_to_quit
           instance = new
           set_ivars(instance, before_all_ivars)
@@ -562,44 +463,6 @@ WARNING
         ivars.each {|name, value| instance.instance_variable_set(name, value)}
       end
 
-      def example=(current_example)
-        RSpec.current_example = current_example
-      end
-
-      # @deprecated use a block argument
-      def example
-        warn_deprecation_of_example_accessor :example
-        RSpec.current_example
-      end
-
-      # @deprecated use a block argument
-      def running_example
-        warn_deprecation_of_example_accessor :running_example
-        RSpec.current_example
-      end
-
-      def warn_deprecation_of_example_accessor(name)
-        RSpec.warn_deprecation(<<-EOS.gsub(/^\s*\|/, ''))
-          |RSpec::Core::ExampleGroup##{name} is deprecated and will be removed
-          |in RSpec 3. There are a few options for what you can use instead:
-          |
-          |  - rspec-core's DSL methods (`it`, `before`, `after`, `let`, `subject`, etc)
-          |    now yield the example as a block argument, and that is the recommended
-          |    way to access the current example from those contexts.
-          |  - The current example is now exposed via `RSpec.current_example`,
-          |    which is accessible from any context.
-          |  - If you can't update the code at this call site (e.g. because it is in
-          |    an extension gem), you can use this snippet to continue making this
-          |    method available in RSpec 2.99 and RSpec 3:
-          |
-          |      RSpec.configure do |c|
-          |        c.expose_current_running_example_as :#{name}
-          |      end
-          |
-          |(Called from #{CallerFilter.first_non_rspec_line})
-        EOS
-      end
-
       # Returns the class or module passed to the `describe` method (or alias).
       # Returns nil if the subject is not a class or module.
       # @example
@@ -617,9 +480,9 @@ WARNING
       # @private
       # instance_evals the block, capturing and reporting an exception if
       # raised
-      def instance_eval_with_rescue(example, context = nil, &hook)
+      def instance_exec_with_rescue(example, context = nil, &hook)
         begin
-          instance_eval_with_args(example, &hook)
+          instance_exec(example, &hook)
         rescue Exception => e
           if RSpec.current_example
             RSpec.current_example.set_exception(e, context)
@@ -630,4 +493,48 @@ WARNING
       end
     end
   end
+
+  # Namespace for the example group subclasses generated by top-level `describe`.
+  module ExampleGroups
+    def self.assign_const(group)
+      base_name   = base_name_for(group)
+      const_scope = constant_scope_for(group)
+      name        = disambiguate(base_name, const_scope)
+
+      const_scope.const_set(name, group)
+    end
+
+    def self.constant_scope_for(group)
+      const_scope = group.superclass
+      const_scope = self if const_scope == Core::ExampleGroup
+      const_scope
+    end
+
+    def self.base_name_for(group)
+      return "Anonymous" if group.description.empty?
+
+      # convert to CamelCase
+      name = ' ' + group.description
+      name.gsub!(/[^0-9a-zA-Z]+([0-9a-zA-Z])/) { $1.upcase }
+
+      name.lstrip!         # Remove leading whitespace
+      name.gsub!(/\W/, '') # JRuby, RBX and others don't like non-ascii in const names
+
+      # Ruby requires first const letter to be A-Z. Use `Nested`
+      # as necessary to enforce that.
+      name.gsub!(/\A([^A-Z]|\z)/, 'Nested\1')
+
+      name
+    end
+
+    def self.disambiguate(name, const_scope)
+      return name unless const_scope.const_defined?(name)
+
+      # Add a trailing number if needed to disambiguate from an existing constant.
+      name << "_2"
+      name.next! while const_scope.const_defined?(name)
+      name
+    end
+  end
 end
+