rspec-core 3.0.4 → 3.1.0

data/lib/rspec/core/configuration_options.rb

@@ -41,14 +41,16 @@ module RSpec
       def organize_options
         @filter_manager_options = []
 
-        @options = (file_options << command_line_options << env_options).each { |opts|
+        @options = (file_options << command_line_options << env_options).each do |opts|
           @filter_manager_options << [:include, opts.delete(:inclusion_filter)] if opts.key?(:inclusion_filter)
           @filter_manager_options << [:exclude, opts.delete(:exclusion_filter)] if opts.key?(:exclusion_filter)
-        }.inject(:libs => [], :requires => []) { |hash, opts|
-          hash.merge(opts) { |key, oldval, newval|
+        end
+
+        @options = @options.inject(:libs => [], :requires => []) do |hash, opts|
+          hash.merge(opts) do |key, oldval, newval|
             [:libs, :requires].include?(key) ? oldval + newval : newval
-          }
-        }
+          end
+        end
       end
 
       UNFORCED_OPTIONS = [
@@ -84,7 +86,7 @@ module RSpec
 
         # These must be set before `requires` to support checking `config.files_to_run`
         # from within `spec_helper.rb` when a `-rspec_helper` option is used.
-        :files_or_directories_to_run, :pattern,
+        :files_or_directories_to_run, :pattern, :exclude_pattern,
 
         # In general, we want to require the specified files as early as possible.
         # The `--require` option is specifically intended to allow early requires.
@@ -161,12 +163,10 @@ module RSpec
       end
 
       def global_options_file
-        begin
-          File.join(File.expand_path("~"), ".rspec")
-        rescue ArgumentError
-          RSpec.warning "Unable to find ~/.rspec because the HOME environment variable is not set"
-          nil
-        end
+        File.join(File.expand_path("~"), ".rspec")
+      rescue ArgumentError
+        RSpec.warning "Unable to find ~/.rspec because the HOME environment variable is not set"
+        nil
       end
     end
   end

data/lib/rspec/core/drb.rb

@@ -60,20 +60,20 @@ module RSpec
       end
 
       def add_failure_exit_code(argv)
-        if @submitted_options[:failure_exit_code]
-          argv << "--failure-exit-code" << @submitted_options[:failure_exit_code].to_s
-        end
+        return unless @submitted_options[:failure_exit_code]
+
+        argv << "--failure-exit-code" << @submitted_options[:failure_exit_code].to_s
       end
 
       def add_full_description(argv)
-        if @submitted_options[:full_description]
-          # The argument to --example is regexp-escaped before being stuffed
-          # into a regexp when received for the first time (see OptionParser).
-          # Hence, merely grabbing the source of this regexp will retain the
-          # backslashes, so we must remove them.
-          @submitted_options[:full_description].each do |description|
-            argv << "--example" << description.source.delete('\\')
-          end
+        return unless @submitted_options[:full_description]
+
+        # The argument to --example is regexp-escaped before being stuffed
+        # into a regexp when received for the first time (see OptionParser).
+        # Hence, merely grabbing the source of this regexp will retain the
+        # backslashes, so we must remove them.
+        @submitted_options[:full_description].each do |description|
+          argv << "--example" << description.source.delete('\\')
         end
       end
 

data/lib/rspec/core/dsl.rb

@@ -85,7 +85,6 @@ module RSpec
         (class << top_level; self; end).class_exec(&changes)
         Module.class_exec(&changes)
       end
-
     end
   end
 end

data/lib/rspec/core/example.rb

@@ -73,9 +73,12 @@ module RSpec
       # there is one, otherwise returns a message including the location of the
       # example.
       def description
-        description = metadata[:description].to_s.empty? ?
-          "example at #{location}" :
-          metadata[:description]
+        description = if metadata[:description].to_s.empty?
+                        "example at #{location}"
+                      else
+                        metadata[:description]
+                      end
+
         RSpec.configuration.format_docstrings_block.call(description)
       end
 
@@ -151,8 +154,8 @@ module RSpec
                   Pending.mark_fixed! self
 
                   raise Pending::PendingExampleFixedError,
-                    'Expected example to fail since it is pending, but it passed.',
-                    [location]
+                        'Expected example to fail since it is pending, but it passed.',
+                        [location]
                 end
               rescue Pending::SkipDeclaredInExample
                 # no-op, required metadata has already been set by the `skip`
@@ -201,25 +204,49 @@ module RSpec
         attr_reader :example
 
         Example.public_instance_methods(false).each do |name|
-          unless name.to_sym == :run
-            define_method(name) { |*a, &b| @example.__send__(name, *a, &b) }
-          end
+          next if name.to_sym == :run || name.to_sym == :inspect
+
+          define_method(name) { |*a, &b| @example.__send__(name, *a, &b) }
         end
 
         Proc.public_instance_methods(false).each do |name|
+          next if name.to_sym == :call || name.to_sym == :inspect || name.to_sym == :to_proc
+
           define_method(name) { |*a, &b| @proc.__send__(name, *a, &b) }
         end
+
+        # Calls the proc and notes that the example has been executed.
+        def call(*args, &block)
+          @executed = true
+          @proc.call(*args, &block)
+        end
         alias run call
 
+        # Provides a wrapped proc that will update our `executed?` state when executed.
+        def to_proc
+          method(:call).to_proc
+        end
+
         def initialize(example, &block)
-          @example = example
-          @proc    = block
+          @example  = example
+          @proc     = block
+          @executed = false
         end
 
         # @private
         def wrap(&block)
           self.class.new(example, &block)
         end
+
+        # Indicates whether or not the around hook has executed the example.
+        def executed?
+          @executed
+        end
+
+        # @private
+        def inspect
+          @example.inspect.gsub('Example', 'ExampleProcsy')
+        end
       end
 
       # @private
@@ -451,7 +478,7 @@ module RSpec
           end
         end
 
-        def issue_deprecation(method_name, *args)
+        def issue_deprecation(_method_name, *_args)
           RSpec.deprecate("Treating `metadata[:execution_result]` as a hash",
                           :replacement => "the attributes methods to access the data")
         end
@@ -466,7 +493,7 @@ module RSpec
       end
 
       # To ensure we don't silence errors...
-      def set_exception(exception, context=nil)
+      def set_exception(exception, _context=nil)
         raise exception
       end
     end

data/lib/rspec/core/example_group.rb

@@ -1,3 +1,5 @@
+RSpec::Support.require_rspec_support 'recursive_const_methods'
+
 module RSpec
   module Core
     # ExampleGroup and {Example} are the main structural elements of
@@ -15,7 +17,7 @@ module RSpec
     #
     # Example group bodies (e.g. `describe` or `context` blocks) are evaluated
     # in the context of a new subclass of ExampleGroup. Individual examples are
-    # evalutaed in the context of an instance of the specific ExampleGroup subclass
+    # evaluated in the context of an instance of the specific ExampleGroup subclass
     # to which they belong.
     #
     # Besides the class methods defined here, there are other interesting macros
@@ -23,12 +25,12 @@ module RSpec
     # There are additional instance methods available to your examples defined in
     # {MemoizedHelpers} and {Pending}.
     class ExampleGroup
-      extend  Hooks
+      extend Hooks
 
       include MemoizedHelpers
-      extend  MemoizedHelpers::ClassMethods
+      extend MemoizedHelpers::ClassMethods
       include Pending
-      extend  SharedExampleGroup
+      extend SharedExampleGroup
 
       unless respond_to?(:define_singleton_method)
         # @private
@@ -48,7 +50,7 @@ module RSpec
       # @private
       # @return [Metadata] belonging to the parent of a nested {ExampleGroup}
       def self.superclass_metadata
-        @superclass_metadata ||= self.superclass.respond_to?(:metadata) ? self.superclass.metadata : nil
+        @superclass_metadata ||= superclass.respond_to?(:metadata) ? superclass.metadata : nil
       end
 
       # @private
@@ -209,8 +211,8 @@ module RSpec
 
           if top_level
             if thread_data[:in_example_group]
-              raise "Creating an isolated context from within a context is " +
-                    "not allowed. Change `RSpec.#{name}` to `#{name}` or " +
+              raise "Creating an isolated context from within a context is " \
+                    "not allowed. Change `RSpec.#{name}` to `#{name}` or " \
                     "move this to a top-level scope."
             end
 
@@ -313,7 +315,9 @@ module RSpec
 
       # @private
       def self.find_and_eval_shared(label, name, *args, &customization_block)
-        unless shared_block = RSpec.world.shared_example_group_registry.find(parent_groups, name)
+        shared_block = RSpec.world.shared_example_group_registry.find(parent_groups, name)
+
+        unless shared_block
           raise ArgumentError, "Could not find shared #{label} #{name.inspect}"
         end
 
@@ -374,7 +378,7 @@ module RSpec
 
       # @private
       def self.descendant_filtered_examples
-        @descendant_filtered_examples ||= filtered_examples + children.inject([]){|l,c| l + c.descendant_filtered_examples}
+        @descendant_filtered_examples ||= filtered_examples + children.inject([]) { |a, e| a + e.descendant_filtered_examples }
       end
 
       # @private
@@ -384,12 +388,12 @@ module RSpec
 
       # @private
       def self.descendants
-        @_descendants ||= [self] + children.inject([]) {|list, c| list + c.descendants}
+        @_descendants ||= [self] + children.inject([]) { |a, e| a + e.descendants }
       end
 
       ## @private
       def self.parent_groups
-        @parent_groups ||= ancestors.select {|a| a < RSpec::Core::ExampleGroup}
+        @parent_groups ||= ancestors.select { |a| a < RSpec::Core::ExampleGroup }
       end
 
       # @private
@@ -402,7 +406,9 @@ module RSpec
         unless defined?(@@example_groups_configured)
           RSpec.configuration.configure_mock_framework
           RSpec.configuration.configure_expectation_framework
+          # rubocop:disable Style/ClassVars
           @@example_groups_configured = true
+          # rubocop:enable Style/ClassVars
         end
       end
 
@@ -415,9 +421,9 @@ module RSpec
       def self.store_before_context_ivars(example_group_instance)
         return if example_group_instance.instance_variables.empty?
 
-        example_group_instance.instance_variables.each { |ivar|
+        example_group_instance.instance_variables.each do |ivar|
           before_context_ivars[ivar] = example_group_instance.instance_variable_get(ivar)
-        }
+        end
       end
 
       # @private
@@ -458,10 +464,10 @@ module RSpec
           results_for_descendants = ordering_strategy.order(children).map { |child| child.run(reporter) }.all?
           result_for_this_group && results_for_descendants
         rescue Pending::SkipDeclaredInExample => ex
-          for_filtered_examples(reporter) {|example| example.skip_with_exception(reporter, ex) }
+          for_filtered_examples(reporter) { |example| example.skip_with_exception(reporter, ex) }
         rescue Exception => ex
           RSpec.world.wants_to_quit = true if fail_fast?
-          for_filtered_examples(reporter) {|example| example.fail_with_exception(reporter, ex) }
+          for_filtered_examples(reporter) { |example| example.fail_with_exception(reporter, ex) }
         ensure
           run_after_context_hooks(new)
           before_context_ivars.clear
@@ -527,8 +533,8 @@ module RSpec
       # @private
       def self.declaration_line_numbers
         @declaration_line_numbers ||= [metadata[:line_number]] +
-          examples.collect {|e| e.metadata[:line_number]} +
-          children.inject([]) {|l,c| l + c.declaration_line_numbers}
+          examples.map { |e| e.metadata[:line_number] } +
+          children.inject([]) { |a, e| a + e.declaration_line_numbers }
       end
 
       # @private
@@ -538,7 +544,7 @@ module RSpec
 
       # @private
       def self.set_ivars(instance, ivars)
-        ivars.each {|name, value| instance.instance_variable_set(name, value)}
+        ivars.each { |name, value| instance.instance_variable_set(name, value) }
       end
 
       # @private
@@ -557,7 +563,10 @@ module RSpec
         # This will fail if no block is provided, which is effectively the
         # same as failing the example so it will be marked correctly as
         # pending.
-        callback = Proc.new { pending(reason); instance_exec(&block) }
+        callback = Proc.new do
+          pending(reason)
+          instance_exec(&block)
+        end
 
         return options, callback
       end
@@ -572,86 +581,11 @@ module RSpec
     end
   end
 
-  # Provides recursive constant lookup methods useful for
-  # constant stubbing.
-  # @private
-  module RecursiveConstMethods
-    # We only want to consider constants that are defined directly on a
-    # particular module, and not include top-level/inherited constants.
-    # Unfortunately, the constant API changed between 1.8 and 1.9, so
-    # we need to conditionally define methods to ignore the top-level/inherited
-    # constants.
-    #
-    # Given:
-    #   class A; B = 1; end
-    #   class C < A; end
-    #
-    # On 1.8:
-    #   - C.const_get("Hash") # => ::Hash
-    #   - C.const_defined?("Hash") # => false
-    #   - C.constants # => ["B"]
-    #   - None of these methods accept the extra `inherit` argument
-    # On 1.9:
-    #   - C.const_get("Hash") # => ::Hash
-    #   - C.const_defined?("Hash") # => true
-    #   - C.const_get("Hash", false) # => raises NameError
-    #   - C.const_defined?("Hash", false) # => false
-    #   - C.constants # => [:B]
-    #   - C.constants(false) #=> []
-    if Module.method(:const_defined?).arity == 1
-      def const_defined_on?(mod, const_name)
-        mod.const_defined?(const_name)
-      end
-
-      def get_const_defined_on(mod, const_name)
-        if const_defined_on?(mod, const_name)
-          return mod.const_get(const_name)
-        end
-
-        raise NameError, "uninitialized constant #{mod.name}::#{const_name}"
-      end
-
-      def constants_defined_on(mod)
-        mod.constants.select { |c| const_defined_on?(mod, c) }
-      end
-    else
-      def const_defined_on?(mod, const_name)
-        mod.const_defined?(const_name, false)
-      end
-
-      def get_const_defined_on(mod, const_name)
-        mod.const_get(const_name, false)
-      end
-
-      def constants_defined_on(mod)
-        mod.constants(false)
-      end
-    end
-
-    def recursive_const_get(const_name)
-      normalize_const_name(const_name).split('::').inject(Object) do |mod, name|
-        get_const_defined_on(mod, name)
-      end
-    end
-
-    def recursive_const_defined?(const_name)
-      normalize_const_name(const_name).split('::').inject([Object, '']) do |(mod, full_name), name|
-        yield(full_name, name) if block_given? && !(Module === mod)
-        return false unless const_defined_on?(mod, name)
-        [get_const_defined_on(mod, name), [mod, name].join('::')]
-      end
-    end
-
-    def normalize_const_name(const_name)
-      const_name.sub(/\A::/, '')
-    end
-  end
-
   # @private
   #
   # Namespace for the example group subclasses generated by top-level `describe`.
   module ExampleGroups
-    extend RecursiveConstMethods
+    extend Support::RecursiveConstMethods
 
     def self.assign_const(group)
       base_name   = base_name_for(group)
@@ -663,7 +597,7 @@ module RSpec
 
     def self.constant_scope_for(group)
       const_scope = group.superclass
-      const_scope = self if const_scope == Core::ExampleGroup
+      const_scope = self if const_scope == ::RSpec::Core::ExampleGroup
       const_scope
     end
 
@@ -672,7 +606,7 @@ module RSpec
 
       # convert to CamelCase
       name = ' ' + group.description
-      name.gsub!(/[^0-9a-zA-Z]+([0-9a-zA-Z])/) { $1.upcase }
+      name.gsub!(/[^0-9a-zA-Z]+([0-9a-zA-Z])/) { Regexp.last_match[1].upcase }
 
       name.lstrip!         # Remove leading whitespace
       name.gsub!(/\W/, '') # JRuby, RBX and others don't like non-ascii in const names
@@ -694,4 +628,3 @@ module RSpec
     end
   end
 end
-

data/lib/rspec/core/filter_manager.rb

@@ -81,7 +81,7 @@ module RSpec
         # locations is a hash of expanded paths to arrays of line
         # numbers to match against. e.g.
         #   { "path/to/file.rb" => [37, 42] }
-        locations = inclusions.delete(:locations) || Hash.new { |h,k| h[k] = [] }
+        locations = inclusions.delete(:locations) || Hash.new { |h, k| h[k] = [] }
         locations[File.expand_path(file_path)].push(*line_numbers)
         inclusions.add_location(locations)
       end
@@ -93,9 +93,9 @@ module RSpec
       def prune(examples)
         if inclusions.standalone?
           base_exclusions = ExclusionRules.new
-          examples.select {|e| !base_exclusions.include_example?(e) && include?(e) }
+          examples.select { |e| !base_exclusions.include_example?(e) && include?(e) }
         else
-          examples.select {|e| !exclude?(e) && include?(e)}
+          examples.select { |e| !exclude?(e) && include?(e) }
         end
       end
 
@@ -156,9 +156,9 @@ module RSpec
         @rules.merge!(updated).each_key { |k| opposite.delete(k) }
       end
 
-      def add_with_low_priority(_updated)
-        updated = _updated.merge(@rules)
-        opposite.each_pair { |k,v| updated.delete(k) if updated[k] == v }
+      def add_with_low_priority(updated)
+        updated = updated.merge(@rules)
+        opposite.each_pair { |k, v| updated.delete(k) if updated[k] == v }
         @rules.replace(updated)
       end
 
@@ -192,7 +192,7 @@ module RSpec
       end
 
       def description
-        rules.inspect.gsub(PROC_HEX_NUMBER, '').gsub(PROJECT_DIR, '.').gsub(' (lambda)','')
+        rules.inspect.gsub(PROC_HEX_NUMBER, '').gsub(PROJECT_DIR, '.').gsub(' (lambda)', '')
       end
     end
 
@@ -201,19 +201,19 @@ module RSpec
       STANDALONE_FILTERS = [:locations, :full_description]
 
       def add_location(locations)
-        replace_filters({ :locations => locations })
+        replace_filters(:locations => locations)
       end
 
       def add(*args)
-        set_standalone_filter(*args) || super
+        apply_standalone_filter(*args) || super
       end
 
       def add_with_low_priority(*args)
-        set_standalone_filter(*args) || super
+        apply_standalone_filter(*args) || super
       end
 
       def use(*args)
-        set_standalone_filter(*args) || super
+        apply_standalone_filter(*args) || super
       end
 
       def include_example?(example)
@@ -226,13 +226,12 @@ module RSpec
 
     private
 
-      def set_standalone_filter(updated)
+      def apply_standalone_filter(updated)
         return true if standalone?
+        return nil unless is_standalone_filter?(updated)
 
-        if is_standalone_filter?(updated)
-          replace_filters(updated)
-          true
-        end
+        replace_filters(updated)
+        true
       end
 
       def replace_filters(new_rules)
@@ -241,7 +240,7 @@ module RSpec
       end
 
       def is_standalone_filter?(rules)
-        STANDALONE_FILTERS.any? { |key| rules.has_key?(key) }
+        STANDALONE_FILTERS.any? { |key| rules.key?(key) }
       end
     end