rspec-core 3.0.4 → 3.1.0

data/lib/rspec/core/metadata_filter.rb

@@ -6,89 +6,89 @@ module RSpec
     # having metadata be a raw hash (not a custom subclass), so externalizing
     # this filtering logic helps us move in that direction.
     module MetadataFilter
-      extend self
-
-      # @private
-      def any_apply?(filters, metadata)
-        filters.any? { |k, v| filter_applies?(k, v, metadata) }
-      end
+      class << self
+        # @private
+        def any_apply?(filters, metadata)
+          filters.any? { |k, v| filter_applies?(k, v, metadata) }
+        end
 
-      # @private
-      def all_apply?(filters, metadata)
-        filters.all? { |k, v| filter_applies?(k, v, metadata) }
-      end
+        # @private
+        def all_apply?(filters, metadata)
+          filters.all? { |k, v| filter_applies?(k, v, metadata) }
+        end
 
-      # @private
-      def filter_applies?(key, value, metadata)
-        silence_metadata_example_group_deprecations do
-          return filter_applies_to_any_value?(key, value, metadata) if Array === metadata[key] && !(Proc === value)
-          return location_filter_applies?(value, metadata)          if key == :locations
-          return filters_apply?(key, value, metadata)               if Hash === value
+        # @private
+        def filter_applies?(key, value, metadata)
+          silence_metadata_example_group_deprecations do
+            return filter_applies_to_any_value?(key, value, metadata) if Array === metadata[key] && !(Proc === value)
+            return location_filter_applies?(value, metadata)          if key == :locations
+            return filters_apply?(key, value, metadata)               if Hash === value
 
-          return false unless metadata.has_key?(key)
+            return false unless metadata.key?(key)
 
-          case value
-          when Regexp
-            metadata[key] =~ value
-          when Proc
-            case value.arity
-            when 0 then value.call
-            when 2 then value.call(metadata[key], metadata)
-            else value.call(metadata[key])
+            case value
+            when Regexp
+              metadata[key] =~ value
+            when Proc
+              case value.arity
+              when 0 then value.call
+              when 2 then value.call(metadata[key], metadata)
+              else value.call(metadata[key])
+              end
+            else
+              metadata[key].to_s == value.to_s
             end
-          else
-            metadata[key].to_s == value.to_s
           end
         end
-      end
 
-    private
+      private
 
-      def filter_applies_to_any_value?(key, value, metadata)
-        metadata[key].any? {|v| filter_applies?(key, v, {key => value})}
-      end
+        def filter_applies_to_any_value?(key, value, metadata)
+          metadata[key].any? { |v| filter_applies?(key, v,  key => value) }
+        end
 
-      def location_filter_applies?(locations, metadata)
-        # it ignores location filters for other files
-        line_number = example_group_declaration_line(locations, metadata)
-        line_number ? line_number_filter_applies?(line_number, metadata) : true
-      end
+        def location_filter_applies?(locations, metadata)
+          # it ignores location filters for other files
+          line_number = example_group_declaration_line(locations, metadata)
+          line_number ? line_number_filter_applies?(line_number, metadata) : true
+        end
 
-      def line_number_filter_applies?(line_numbers, metadata)
-        preceding_declaration_lines = line_numbers.map {|n| RSpec.world.preceding_declaration_line(n)}
-        !(relevant_line_numbers(metadata) & preceding_declaration_lines).empty?
-      end
+        def line_number_filter_applies?(line_numbers, metadata)
+          preceding_declaration_lines = line_numbers.map { |n| RSpec.world.preceding_declaration_line(n) }
+          !(relevant_line_numbers(metadata) & preceding_declaration_lines).empty?
+        end
 
-      def relevant_line_numbers(metadata)
-        return [] unless metadata
-        [metadata[:line_number]].compact + (relevant_line_numbers(parent_of metadata))
-      end
+        def relevant_line_numbers(metadata)
+          return [] unless metadata
+          [metadata[:line_number]].compact + (relevant_line_numbers(parent_of metadata))
+        end
 
-      def example_group_declaration_line(locations, metadata)
-        parent = parent_of(metadata)
-        return nil unless parent
-        locations[File.expand_path(parent[:file_path])]
-      end
+        def example_group_declaration_line(locations, metadata)
+          parent = parent_of(metadata)
+          return nil unless parent
+          locations[File.expand_path(parent[:file_path])]
+        end
 
-      def filters_apply?(key, value, metadata)
-        subhash = metadata[key]
-        return false unless Hash === subhash || HashImitatable === subhash
-        value.all? { |k, v| filter_applies?(k, v, subhash) }
-      end
+        def filters_apply?(key, value, metadata)
+          subhash = metadata[key]
+          return false unless Hash === subhash || HashImitatable === subhash
+          value.all? { |k, v| filter_applies?(k, v, subhash) }
+        end
 
-      def parent_of(metadata)
-        if metadata.key?(:example_group)
-          metadata[:example_group]
-        else
-          metadata[:parent_example_group]
+        def parent_of(metadata)
+          if metadata.key?(:example_group)
+            metadata[:example_group]
+          else
+            metadata[:parent_example_group]
+          end
         end
-      end
 
-      def silence_metadata_example_group_deprecations
-        RSpec.thread_local_metadata[:silence_metadata_example_group_deprecations] = true
-        yield
-      ensure
-        RSpec.thread_local_metadata.delete(:silence_metadata_example_group_deprecations)
+        def silence_metadata_example_group_deprecations
+          RSpec.thread_local_metadata[:silence_metadata_example_group_deprecations] = true
+          yield
+        ensure
+          RSpec.thread_local_metadata.delete(:silence_metadata_example_group_deprecations)
+        end
       end
     end
   end

data/lib/rspec/core/minitest_assertions_adapter.rb

@@ -2,7 +2,7 @@ begin
   # Only the minitest 5.x gem includes the minitest.rb and assertions.rb files
   require 'minitest'
   require 'minitest/assertions'
-rescue LoadError => _ignored
+rescue LoadError
   # We must be using Ruby Core's MiniTest or the Minitest gem 4.x
   require 'minitest/unit'
   Minitest = MiniTest

data/lib/rspec/core/mocking_adapters/flexmock.rb

@@ -10,7 +10,9 @@ module RSpec
       module Flexmock
         include ::FlexMock::MockContainer
 
-        def self.framework_name; :flexmock end
+        def self.framework_name
+          :flexmock
+        end
 
         def setup_mocks_for_rspec
           # No setup required

data/lib/rspec/core/mocking_adapters/mocha.rb

@@ -29,7 +29,9 @@ module RSpec
     module MockingAdapters
       # @private
       module Mocha
-        def self.framework_name; :mocha end
+        def self.framework_name
+          :mocha
+        end
 
         # Mocha::Standalone was deprecated as of Mocha 0.9.7.
         begin

data/lib/rspec/core/mocking_adapters/null.rb

@@ -4,7 +4,9 @@ module RSpec
       # @private
       module Null
         def setup_mocks_for_rspec; end
+
         def verify_mocks_for_rspec; end
+
         def teardown_mocks_for_rspec; end
       end
     end

data/lib/rspec/core/mocking_adapters/rr.rb

@@ -8,7 +8,9 @@ module RSpec
     module MockingAdapters
       # @private
       module RR
-        def self.framework_name; :rr end
+        def self.framework_name
+          :rr
+        end
 
         include ::RR::Extensions::InstanceMethods
 

data/lib/rspec/core/mocking_adapters/rspec.rb

@@ -7,7 +7,9 @@ module RSpec
       module RSpec
         include ::RSpec::Mocks::ExampleMethods
 
-        def self.framework_name; :rspec end
+        def self.framework_name
+          :rspec
+        end
 
         def self.configuration
           ::RSpec::Mocks.configuration

data/lib/rspec/core/notifications.rb

@@ -1,12 +1,13 @@
 RSpec::Support.require_rspec_core "formatters/helpers"
+RSpec::Support.require_rspec_support "encoded_string"
 
 module RSpec::Core
   # Notifications are value objects passed to formatters to provide them
   # with information about a particular event of interest.
   module Notifications
-
     # @private
-    class NullColorizer
+    module NullColorizer
+      module_function
       def wrap(line, _code_or_symbol)
         line
       end
@@ -54,7 +55,6 @@ module RSpec::Core
     #   end
     #
     class ExamplesNotification
-
       def initialize(reporter)
         @reporter = reporter
       end
@@ -77,18 +77,18 @@ module RSpec::Core
       # @return [Array(Rspec::Core::Notifications::ExampleNotification]
       #         returns examples as notifications
       def notifications
-        @notifications ||= format(examples)
+        @notifications ||= format_examples(examples)
       end
 
       # @return [Array(Rspec::Core::Notifications::FailedExampleNotification]
       #         returns failed examples as notifications
       def failure_notifications
-        @failed_notifications ||= format(failed_examples)
+        @failed_notifications ||= format_examples(failed_examples)
       end
 
       # @return [String] The list of failed examples, fully formatted in the way that
       #   RSpec's built-in formatters emit.
-      def fully_formatted_failed_examples(colorizer = ::RSpec::Core::Formatters::ConsoleCodes)
+      def fully_formatted_failed_examples(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
         formatted = "\nFailures:\n"
 
         failure_notifications.each_with_index do |failure, index|
@@ -100,15 +100,15 @@ module RSpec::Core
 
       # @return [String] The list of pending examples, fully formatted in the way that
       #   RSpec's built-in formatters emit.
-      def fully_formatted_pending_examples(colorizer = ::RSpec::Core::Formatters::ConsoleCodes)
+      def fully_formatted_pending_examples(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
         formatted = "\nPending:\n"
 
         pending_examples.each do |example|
           formatted_caller = RSpec.configuration.backtrace_formatter.backtrace_line(example.location)
 
           formatted <<
-            "  #{colorizer.wrap(example.full_description, :pending)}\n" <<
-            "    # #{colorizer.wrap(example.execution_result.pending_message, :detail)}\n" <<
+            "  #{colorizer.wrap(example.full_description, :pending)}\n" \
+            "    # #{colorizer.wrap(example.execution_result.pending_message, :detail)}\n" \
             "    # #{colorizer.wrap(formatted_caller, :detail)}\n"
         end
 
@@ -117,12 +117,11 @@ module RSpec::Core
 
     private
 
-      def format(examples)
+      def format_examples(examples)
         examples.map do |example|
           ExampleNotification.for(example)
         end
       end
-
     end
 
     # The `FailedExampleNotification` extends `ExampleNotification` with
@@ -161,7 +160,7 @@ module RSpec::Core
       #
       # @param colorizer [#wrap] An object to colorize the message_lines by
       # @return [Array(String)] The example failure message colorized
-      def colorized_message_lines(colorizer = ::RSpec::Core::Formatters::ConsoleCodes)
+      def colorized_message_lines(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
         add_shared_group_line(failure_lines, colorizer).map do |line|
           colorizer.wrap line, RSpec.configuration.failure_color
         end
@@ -178,7 +177,7 @@ module RSpec::Core
       #
       # @param colorizer [#wrap] An object to colorize the message_lines by
       # @return [Array(String)] the examples colorized backtrace lines
-      def colorized_formatted_backtrace(colorizer = ::RSpec::Core::Formatters::ConsoleCodes)
+      def colorized_formatted_backtrace(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
         formatted_backtrace.map do |backtrace_info|
           colorizer.wrap "# #{backtrace_info}", RSpec.configuration.detail_color
         end
@@ -186,15 +185,15 @@ module RSpec::Core
 
       # @return [String] The failure information fully formatted in the way that
       #   RSpec's built-in formatters emit.
-      def fully_formatted(failure_number, colorizer = ::RSpec::Core::Formatters::ConsoleCodes)
+      def fully_formatted(failure_number, colorizer=::RSpec::Core::Formatters::ConsoleCodes)
         formatted = "\n  #{failure_number}) #{description}\n"
 
         colorized_message_lines(colorizer).each do |line|
-          formatted << "     #{line}\n"
+          formatted << RSpec::Support::EncodedString.new("     #{line}\n", encoding_of(formatted))
         end
 
         colorized_formatted_backtrace(colorizer).each do |line|
-          formatted << "     #{line}\n"
+          formatted << RSpec::Support::EncodedString.new("     #{line}\n", encoding_of(formatted))
         end
 
         formatted
@@ -202,13 +201,22 @@ module RSpec::Core
 
     private
 
+      if String.method_defined?(:encoding)
+        def encoding_of(string)
+          string.encoding
+        end
+      else
+        def encoding_of(_string)
+        end
+      end
+
       def backtrace_formatter
         RSpec.configuration.backtrace_formatter
       end
 
       def exception_class_name
         name = exception.class.name.to_s
-        name ="(anonymous error class)" if name == ''
+        name = "(anonymous error class)" if name == ''
         name
       end
 
@@ -238,8 +246,8 @@ module RSpec::Core
       def shared_group_line
         @shared_group_line ||=
           if shared_group
-             "Shared Example Group: \"#{shared_group.metadata[:shared_group_name]}\"" +
-              " called from #{backtrace_formatter.backtrace_line(shared_group.location)}"
+            "Shared Example Group: \"#{shared_group.metadata[:shared_group_name]}\"" \
+             " called from #{backtrace_formatter.backtrace_line(shared_group.location)}"
           else
             ""
           end
@@ -250,7 +258,8 @@ module RSpec::Core
       end
 
       def read_failed_line
-        unless matching_line = find_failed_line
+        matching_line = find_failed_line
+        unless matching_line
           return "Unable to find matching line from backtrace"
         end
 
@@ -268,7 +277,7 @@ module RSpec::Core
 
       def find_failed_line
         path = File.expand_path(example.file_path)
-        exception.backtrace.detect do |line|
+        exception.backtrace.find do |line|
           match = line.match(/(.+?):(\d+)(|:\d+)/)
           match && match[1].downcase == path.downcase
         end
@@ -301,7 +310,7 @@ module RSpec::Core
       #
       # @param colorizer [#wrap] An object to colorize the message_lines by
       # @return [Array(String)] The example failure message colorized
-      def colorized_message_lines(colorizer = ::RSpec::Core::Formatters::ConsoleCodes)
+      def colorized_message_lines(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
         message_lines.map { |line| colorizer.wrap(line, RSpec.configuration.fixed_color) }
       end
     end
@@ -391,7 +400,7 @@ module RSpec::Core
       # @param colorizer [#wrap] An object which supports wrapping text with
       #                          specific colors.
       # @return [String] A colorized results line.
-      def colorized_totals_line(colorizer = ::RSpec::Core::Formatters::ConsoleCodes)
+      def colorized_totals_line(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
         if failure_count > 0
           colorizer.wrap(totals_line, RSpec.configuration.failure_color)
         elsif pending_count > 0
@@ -408,7 +417,7 @@ module RSpec::Core
       # @param colorizer [#wrap] An object which supports wrapping text with
       #                          specific colors.
       # @return [String] A colorized summary line.
-      def colorized_rerun_commands(colorizer = ::RSpec::Core::Formatters::ConsoleCodes)
+      def colorized_rerun_commands(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
         "\nFailed examples:\n\n" +
         failed_examples.map do |example|
           colorizer.wrap("rspec #{example.location}",     RSpec.configuration.failure_color) + " " +
@@ -429,7 +438,7 @@ module RSpec::Core
 
       # @return [String] The summary information fully formatted in the way that
       #   RSpec's built-in formatters emit.
-      def fully_formatted(colorizer = ::RSpec::Core::Formatters::ConsoleCodes)
+      def fully_formatted(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
         formatted = "\nFinished in #{formatted_duration} " \
                     "(files took #{formatted_load_time} to load)\n" \
                     "#{colorized_totals_line(colorizer)}\n"
@@ -492,9 +501,8 @@ module RSpec::Core
           location_hash = example_groups[location] ||= Hash.new(0)
           location_hash[:total_time]  += example.execution_result.run_time
           location_hash[:count]       += 1
-          unless location_hash.has_key?(:description)
-            location_hash[:description] = example.example_group.top_level_description
-          end
+          next if location_hash.key?(:description)
+          location_hash[:description] = example.example_group.top_level_description
         end
 
         # stop if we've only one example group
@@ -530,6 +538,5 @@ module RSpec::Core
     # currently require no information, but we may wish to extend in future.
     class NullNotification
     end
-
   end
 end

data/lib/rspec/core/option_parser.rb

@@ -11,7 +11,7 @@ module RSpec::Core
     def parse(args)
       return {} if args.empty?
 
-      options = args.delete('--tty') ? {:tty => true} : {}
+      options = args.delete('--tty') ? { :tty => true } : {}
       begin
         parser(options).parse!(args)
       rescue OptionParser::InvalidOption => e
@@ -51,11 +51,11 @@ module RSpec::Core
           options[:order] = "rand:#{seed}"
         end
 
-        parser.on('--fail-fast', 'Abort the run on first failure.') do |o|
+        parser.on('--fail-fast', 'Abort the run on first failure.') do |_o|
           options[:fail_fast] = true
         end
 
-        parser.on('--no-fail-fast', 'Do not abort the run on first failure.') do |o|
+        parser.on('--no-fail-fast', 'Do not abort the run on first failure.') do |_o|
           options[:fail_fast] = false
         end
 
@@ -64,7 +64,7 @@ module RSpec::Core
         end
 
         parser.on('--dry-run', 'Print the formatter output of your suite without',
-                  '  running any examples or hooks') do |o|
+                  '  running any examples or hooks') do |_o|
           options[:dry_run] = true
         end
 
@@ -76,7 +76,7 @@ module RSpec::Core
           options[:drb_port] = o.to_i
         end
 
-        parser.on('--init', 'Initialize your project with RSpec.') do |cmd|
+        parser.on('--init', 'Initialize your project with RSpec.') do |_cmd|
           RSpec::Support.require_rspec_core "project_initializer"
           ProjectInitializer.new.run
           exit
@@ -85,11 +85,11 @@ module RSpec::Core
         parser.separator("\n  **** Output ****\n\n")
 
         parser.on('-f', '--format FORMATTER', 'Choose a formatter.',
-                '  [p]rogress (default - dots)',
-                '  [d]ocumentation (group and example names)',
-                '  [h]tml',
-                '  [j]son',
-                '  custom formatter class name') do |o|
+                  '  [p]rogress (default - dots)',
+                  '  [d]ocumentation (group and example names)',
+                  '  [h]tml',
+                  '  [j]son',
+                  '  custom formatter class name') do |o|
           options[:formatters] ||= []
           options[:formatters] << [o]
         end
@@ -107,7 +107,7 @@ module RSpec::Core
           options[:deprecation_stream] = file
         end
 
-        parser.on('-b', '--backtrace', 'Enable full backtrace.') do |o|
+        parser.on('-b', '--backtrace', 'Enable full backtrace.') do |_o|
           options[:full_backtrace] = true
         end
 
@@ -124,10 +124,10 @@ module RSpec::Core
                                          begin
                                            Integer(argument)
                                          rescue ArgumentError
-                                           RSpec.warning "Non integer specified as profile count, seperate " +
-                                                       "your path from options with -- e.g. " +
+                                           RSpec.warning "Non integer specified as profile count, seperate " \
+                                                       "your path from options with -- e.g. " \
                                                        "`rspec --profile -- #{argument}`",
-                                                       :call_site => nil
+                                                         :call_site => nil
                                            true
                                          end
                                        end
@@ -153,8 +153,12 @@ FILTERING
           options[:pattern] = o
         end
 
+        parser.on('--exclude-pattern PATTERN', 'Load files except those matching pattern. Opposite effect of --pattern.') do |o|
+          options[:exclude_pattern] = o
+        end
+
         parser.on('-e', '--example STRING', "Run examples whose full nested names include STRING (may be",
-                                            "  used more than once)") do |o|
+                  "  used more than once)") do |o|
           (options[:full_description] ||= []) << Regexp.compile(Regexp.escape(o))
         end
 
@@ -165,25 +169,25 @@ FILTERING
                   '  - TAG is always converted to a symbol') do |tag|
           filter_type = tag =~ /^~/ ? :exclusion_filter : :inclusion_filter
 
-          name,value = tag.gsub(/^(~@|~|@)/, '').split(':',2)
+          name, value = tag.gsub(/^(~@|~|@)/, '').split(':', 2)
           name = name.to_sym
 
           options[filter_type] ||= {}
           options[filter_type][name] = case value
-                                         when  nil        then true # The default value for tags is true
-                                         when 'true'      then true
-                                         when 'false'     then false
-                                         when 'nil'       then nil
-                                         when /^:/        then value[1..-1].to_sym
-                                         when /^\d+$/     then Integer(value)
-                                         when /^\d+.\d+$/ then Float(value)
+                                       when  nil        then true # The default value for tags is true
+                                       when 'true'      then true
+                                       when 'false'     then false
+                                       when 'nil'       then nil
+                                       when /^:/        then value[1..-1].to_sym
+                                       when /^\d+$/     then Integer(value)
+                                       when /^\d+.\d+$/ then Float(value)
                                        else
                                          value
                                        end
         end
 
         parser.on('--default-path PATH', 'Set the default path where RSpec looks for examples (can',
-                                         '  be a path to a file or a directory).') do |path|
+                  '  be a path to a file or a directory).') do |path|
           options[:default_path] = path
         end
 
@@ -201,7 +205,7 @@ FILTERING
 
         parser.on_tail('-h', '--help', "You're looking at it.") do
           # removing the blank invalid options from the output
-          puts parser.to_s.gsub(/^\s+(#{invalid_options.join('|')})\s*$\n/,'')
+          puts parser.to_s.gsub(/^\s+(#{invalid_options.join('|')})\s*$\n/, '')
           exit
         end