rspec-core 3.13.5 → 4.0.0.beta1

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

@@ -31,7 +31,7 @@ module RSpec
 
           if duration > 60
             minutes = (duration.round / 60).to_i
-            seconds = (duration - minutes * 60)
+            seconds = (duration - (minutes * 60))
 
             "#{pluralize(minutes, 'minute')} #{pluralize(format_seconds(seconds, precision), 'second')}"
           else

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

@@ -6,6 +6,7 @@ module RSpec
       # @private
       class HtmlPrinter
         include ERB::Util # For the #h method.
+
         def initialize(output)
           @output = output
         end
@@ -29,8 +30,8 @@ module RSpec
         def print_example_passed(description, run_time)
           formatted_run_time = "%.5f" % run_time
           @output.puts "    <dd class=\"example passed\">" \
-            "<span class=\"passed_spec_name\">#{h(description)}</span>" \
-            "<span class='duration'>#{formatted_run_time}s</span></dd>"
+                       "<span class=\"passed_spec_name\">#{h(description)}</span>" \
+                       "<span class='duration'>#{formatted_run_time}s</span></dd>"
         end
 
         def print_example_failed(pending_fixed, description, run_time, failure_id,
@@ -52,8 +53,8 @@ module RSpec
 
         def print_example_pending(description, pending_message)
           @output.puts "    <dd class=\"example not_implemented\">" \
-            "<span class=\"not_implemented_spec_name\">#{h(description)} " \
-            "(PENDING: #{h(pending_message)})</span></dd>"
+                       "<span class=\"not_implemented_spec_name\">#{h(description)} " \
+                       "(PENDING: #{h(pending_message)})</span></dd>"
         end
 
         def print_summary(duration, example_count, failure_count, pending_count)
@@ -66,10 +67,10 @@ module RSpec
           formatted_duration = "%.5f" % duration
 
           @output.puts "<script type=\"text/javascript\">" \
-            "document.getElementById('duration').innerHTML = \"Finished in " \
-            "<strong>#{formatted_duration} seconds</strong>\";</script>"
+                       "document.getElementById('duration').innerHTML = \"Finished in " \
+                       "<strong>#{formatted_duration} seconds</strong>\";</script>"
           @output.puts "<script type=\"text/javascript\">" \
-            "document.getElementById('totals').innerHTML = \"#{totals}\";</script>"
+                       "document.getElementById('totals').innerHTML = \"#{totals}\";</script>"
           @output.puts "</div>"
           @output.puts "</div>"
           @output.puts "</body>"

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

@@ -92,10 +92,6 @@ module RSpec
           else
             "# Couldn't get snippet for #{file}"
           end
-        rescue SecurityError
-          # :nocov: - SecurityError is no longer produced starting in ruby 2.7
-          "# Couldn't get snippet for #{file}"
-          # :nocov:
         end
 
         # @api private

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

@@ -31,8 +31,8 @@ module RSpec
 
         def dump_profile_slowest_examples(profile)
           @output.puts "\nTop #{profile.slowest_examples.size} slowest " \
-            "examples (#{Helpers.format_seconds(profile.slow_duration)} " \
-            "seconds, #{profile.percentage}% of total time):\n"
+                       "examples (#{Helpers.format_seconds(profile.slow_duration)} " \
+                       "seconds, #{profile.percentage}% of total time):\n"
 
           profile.slowest_examples.each do |example|
             @output.puts "  #{example.full_description}"

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

@@ -1,3 +1,5 @@
+RSpec::Support.require_rspec_support 'ruby_features'
+
 module RSpec
   module Core
     module Formatters
@@ -68,7 +70,7 @@ module RSpec
           end
 
           def unclosed_tokens_in_line_range(line_range)
-            tokens = FlatMap.flat_map(line_range) do |line_number|
+            tokens = line_range.flat_map do |line_number|
               source.tokens_by_line_number[line_number]
             end
 

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

@@ -1,3 +1,5 @@
+RSpec::Support.require_rspec_support 'ruby_features'
+
 module RSpec
   module Core
     module Formatters

data/lib/rspec/core/formatters.rb

@@ -160,19 +160,15 @@ module RSpec::Core::Formatters
         formatter = RSpec::LegacyFormatters.load_formatter formatter_class, *args
         register formatter, formatter.notifications
       else
-        call_site = "Formatter added at: #{::RSpec::CallerFilter.first_non_rspec_line}"
-
-        RSpec.warn_deprecation <<-WARNING.gsub(/\s*\|/, ' ')
+        raise ArgumentError, <<-ERROR.gsub(/\s*\|/, ' ')
           |The #{formatter_class} formatter uses the deprecated formatter
-          |interface not supported directly by RSpec 3.
+          |interface not supported directly by RSpec 4.
           |
           |To continue to use this formatter you must install the
           |`rspec-legacy_formatters` gem, which provides support
           |for legacy formatters or upgrade the formatter to a
           |compatible version.
-          |
-          |#{call_site}
-        WARNING
+        ERROR
       end
     end
 
@@ -258,7 +254,7 @@ module RSpec::Core::Formatters
     # activesupport/lib/active_support/inflector/methods.rb, line 48
     def underscore(camel_cased_word)
       word = camel_cased_word.to_s.dup
-      word.gsub!(/::/, '/')
+      word.gsub!('::', '/')
       word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
       word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
       word.tr!("-", "_")

data/lib/rspec/core/hooks.rb

@@ -112,9 +112,9 @@ module RSpec
       #
       # ### Warning: implicit before blocks
       #
-      # `before` hooks can also be declared in shared contexts which get
-      # included implicitly either by you or by extension libraries. Since
-      # RSpec runs these in the order in which they are declared within each
+      # `before` hooks can also be declared in configuration-level shared contexts
+      # which get included implicitly either by you or by extension libraries.
+      # Since RSpec runs these in the order in which they are declared within each
       # scope, load order matters, and can lead to confusing results when one
       # before block depends on state that is prepared in another before block
       # that gets run later.
@@ -393,16 +393,8 @@ module RSpec
                                 "#{hook_description} did not execute the example")
         end
 
-        if Proc.method_defined?(:source_location)
-          def hook_description
-            "around hook at #{Metadata.relative_path(block.source_location.join(':'))}"
-          end
-        else # for 1.8.7
-          # :nocov:
-          def hook_description
-            "around hook"
-          end
-          # :nocov:
+        def hook_description
+          "around hook at #{Metadata.relative_path(block.source_location.take(2).join(':'))}"
         end
       end
 
@@ -450,18 +442,13 @@ module RSpec
           scope, options = scope_and_options_from(*args)
 
           if scope == :suite
-            # TODO: consider making this an error in RSpec 4. For SemVer reasons,
-            # we are only warning in RSpec 3.
-            RSpec.warn_with "WARNING: `#{position}(:suite)` hooks are only supported on " \
-                            "the RSpec configuration object. This " \
-                            "`#{position}(:suite)` hook, registered on an example " \
-                            "group, will be ignored."
-            return
+            raise ArgumentError, "`#{position}(:suite)` hooks are only " \
+                                 "supported on the RSpec configuration object. This " \
+                                 "`#{position}(:suite)` hook, registered on an example " \
+                                 "group, will be ignored."
           elsif scope == :context && position == :around
-            # TODO: consider making this an error in RSpec 4. For SemVer reasons,
-            # we are only warning in RSpec 3.
-            RSpec.warn_with "WARNING: `around(:context)` hooks are not supported and " \
-                            "behave like `around(:example)`."
+            raise ArgumentError, "`around(:context)` hooks are not supported " \
+                                 "and behave like `around(:example)`."
           end
 
           hook = HOOK_TYPES[position][scope].new(block, options)
@@ -553,18 +540,18 @@ module RSpec
         def ensure_hooks_initialized_for(position, scope)
           if position == :before
             if scope == :example
-              @before_example_hooks ||= @filterable_item_repo_class.new(:all?)
+              @before_example_hooks ||= @filterable_item_repo_class.new
             else
-              @before_context_hooks ||= @filterable_item_repo_class.new(:all?)
+              @before_context_hooks ||= @filterable_item_repo_class.new
             end
           elsif position == :after
             if scope == :example
-              @after_example_hooks ||= @filterable_item_repo_class.new(:all?)
+              @after_example_hooks ||= @filterable_item_repo_class.new
             else
-              @after_context_hooks ||= @filterable_item_repo_class.new(:all?)
+              @after_context_hooks ||= @filterable_item_repo_class.new
             end
           else # around
-            @around_example_hooks ||= @filterable_item_repo_class.new(:all?)
+            @around_example_hooks ||= @filterable_item_repo_class.new
           end
         end
 
@@ -572,7 +559,7 @@ module RSpec
           hooks_to_process = globals.processable_hooks_for(position, scope, host)
           return if hooks_to_process.empty?
 
-          hooks_to_process -= FlatMap.flat_map(parent_groups) do |group|
+          hooks_to_process -= parent_groups.flat_map do |group|
             group.hooks.all_hooks_for(position, scope)
           end
           return if hooks_to_process.empty?
@@ -584,7 +571,7 @@ module RSpec
         def scope_and_options_from(*args)
           return :suite if args.first == :suite
           scope = extract_scope_from(args)
-          meta  = Metadata.build_hash_from(args, :warn_about_example_group_filtering)
+          meta  = Metadata.build_hash_from(args)
           return scope, meta
         end
 
@@ -593,9 +580,9 @@ module RSpec
             normalized_scope_for(args.shift)
           elsif args.any? { |a| a.is_a?(Symbol) }
             error_message = "You must explicitly give a scope " \
-              "(#{SCOPES.join(", ")}) or scope alias " \
-              "(#{SCOPE_ALIASES.keys.join(", ")}) when using symbols as " \
-              "metadata for a hook."
+                            "(#{SCOPES.join(", ")}) or scope alias " \
+                            "(#{SCOPE_ALIASES.keys.join(", ")}) when using symbols as " \
+                            "metadata for a hook."
             raise ArgumentError.new error_message
           else
             :example
@@ -617,7 +604,7 @@ module RSpec
         end
 
         def run_around_example_hooks_for(example)
-          hooks = FlatMap.flat_map(owner_parent_groups) do |group|
+          hooks = owner_parent_groups.flat_map do |group|
             group.hooks.matching_hooks_for(:around, :example, example)
           end
 
@@ -629,16 +616,8 @@ module RSpec
           end.call
         end
 
-        if respond_to?(:singleton_class) && singleton_class.ancestors.include?(singleton_class)
-          def owner_parent_groups
-            @owner.parent_groups
-          end
-        else # Ruby < 2.1 (see https://bugs.ruby-lang.org/issues/8035)
-          # :nocov:
-          def owner_parent_groups
-            @owner_parent_groups ||= [@owner] + @owner.parent_groups
-          end
-          # :nocov:
+        def owner_parent_groups
+          @owner.parent_groups
         end
       end
     end

data/lib/rspec/core/memoized_helpers.rb

@@ -12,8 +12,6 @@ module RSpec
       #
       #       RSpec.describe Widget do
       #         it { is_expected.to validate_presence_of(:name) }
-      #         # or
-      #         it { should validate_presence_of(:name) }
       #       end
       #
       #   While the examples below demonstrate how to use `subject`
@@ -25,25 +23,21 @@ module RSpec
       #   # Explicit declaration of subject.
       #   RSpec.describe Person do
       #     subject { Person.new(:birthdate => 19.years.ago) }
-      #     it "should be eligible to vote" do
-      #       subject.should be_eligible_to_vote
-      #       # ^ ^ explicit reference to subject not recommended
+      #     it "is eligible to vote" do
+      #       is_expected.to be_eligible_to_vote
       #     end
       #   end
       #
       #   # Implicit subject => { Person.new }.
       #   RSpec.describe Person do
-      #     it "should be eligible to vote" do
-      #       subject.should be_eligible_to_vote
-      #       # ^ ^ explicit reference to subject not recommended
+      #     it "is eligible to vote" do
+      #       is_expected.to be_eligible_to_vote
       #     end
       #   end
       #
       #   # One-liner syntax - expectation is set on the subject.
       #   RSpec.describe Person do
       #     it { is_expected.to be_eligible_to_vote }
-      #     # or
-      #     it { should be_eligible_to_vote }
       #   end
       #
       # @note Because `subject` is designed to create state that is reset
@@ -51,8 +45,6 @@ module RSpec
       #   state that is shared across _all_ examples in an example group,
       #   `subject` is _not_ intended to be used in a `before(:context)` hook.
       #
-      # @see #should
-      # @see #should_not
       # @see #is_expected
       def subject
         __memoized.fetch_or_store(:subject) do
@@ -61,47 +53,6 @@ module RSpec
         end
       end
 
-      # When `should` is called with no explicit receiver, the call is
-      # delegated to the object returned by `subject`. Combined with an
-      # implicit subject this supports very concise expressions.
-      #
-      # @example
-      #
-      #   RSpec.describe Person do
-      #     it { should be_eligible_to_vote }
-      #   end
-      #
-      # @see #subject
-      # @see #is_expected
-      #
-      # @note This only works if you are using rspec-expectations.
-      # @note If you are using RSpec's newer expect-based syntax you may
-      #       want to use `is_expected.to` instead of `should`.
-      def should(matcher=nil, message=nil)
-        enforce_value_expectation(matcher, 'should')
-        RSpec::Expectations::PositiveExpectationHandler.handle_matcher(subject, matcher, message)
-      end
-
-      # Just like `should`, `should_not` delegates to the subject (implicit or
-      # explicit) of the example group.
-      #
-      # @example
-      #
-      #   RSpec.describe Person do
-      #     it { should_not be_eligible_to_vote }
-      #   end
-      #
-      # @see #subject
-      # @see #is_expected
-      #
-      # @note This only works if you are using rspec-expectations.
-      # @note If you are using RSpec's newer expect-based syntax you may
-      #       want to use `is_expected.to_not` instead of `should_not`.
-      def should_not(matcher=nil, message=nil)
-        enforce_value_expectation(matcher, 'should_not')
-        RSpec::Expectations::NegativeExpectationHandler.handle_matcher(subject, matcher, message)
-      end
-
       # Wraps the `subject` in `expect` to make it the target of an expectation.
       # Designed to read nicely for one-liners.
       #
@@ -113,8 +64,6 @@ module RSpec
       #   end
       #
       # @see #subject
-      # @see #should
-      # @see #should_not
       #
       # @note This only works if you are using rspec-expectations.
       def is_expected
@@ -146,26 +95,6 @@ module RSpec
                       end
       end
 
-      # @private
-      def enforce_value_expectation(matcher, method_name)
-        return if matcher_supports_value_expectations?(matcher)
-
-        RSpec.deprecate(
-          "#{method_name} #{RSpec::Support::ObjectFormatter.format(matcher)}",
-          :message =>
-            "The implicit block expectation syntax is deprecated, you should pass " \
-            "a block to `expect` to use the provided block expectation matcher " \
-            "(#{RSpec::Support::ObjectFormatter.format(matcher)}), " \
-            "or the matcher must implement `supports_value_expectations?`."
-        )
-      end
-
-      def matcher_supports_value_expectations?(matcher)
-        matcher.supports_value_expectations?
-      rescue
-        true
-      end
-
       # @private
       class ThreadsafeMemoized
         def initialize
@@ -300,7 +229,7 @@ EOS
         #       thing.do_something
         #
         #       # Second invocation, returns the memoized value.
-        #       thing.should be_something
+        #       expect(thing).to be_something
         #     end
         #   end
         def let(name, &block)
@@ -321,7 +250,7 @@ EOS
           #
           # Note we do not check ancestor modules (see: `instance_methods(false)`)
           # as we can override them.
-          if our_module.instance_methods(false).include?(name)
+          if our_module.method_defined?(name, false)
             our_module.__send__(:remove_method, name)
           end
           our_module.__send__(:define_method, name, &block)
@@ -331,7 +260,7 @@ EOS
           #
           # Note we do not check ancestor modules (see: `instance_methods(false)`)
           # as we can override them.
-          if instance_methods(false).include?(name)
+          if method_defined?(name, false)
             remove_method(name)
           end
 
@@ -375,12 +304,12 @@ EOS
         #       let(:thing) { Thing.new }
         #
         #       it "is not invoked implicitly" do
-        #         Thing.count.should eq(0)
+        #         expect(Thing.count).to eq(0)
         #       end
         #
         #       it "can be invoked explicitly" do
         #         thing
-        #         Thing.count.should eq(1)
+        #         expect(Thing.count).to eq(1)
         #       end
         #     end
         #
@@ -388,12 +317,12 @@ EOS
         #       let!(:thing) { Thing.new }
         #
         #       it "is invoked implicitly" do
-        #         Thing.count.should eq(1)
+        #         expect(Thing.count).to eq(1)
         #       end
         #
         #       it "returns memoized version on first invocation" do
         #         thing
-        #         Thing.count.should eq(1)
+        #         expect(Thing.count).to eq(1)
         #       end
         #     end
         #   end
@@ -434,12 +363,10 @@ EOS
         #     subject(:account) { CheckingAccount.new(Money.new(50, :USD)) }
         #     it { is_expected.not_to be_overdrawn }
         #     it "has a balance equal to the starting balance" do
-        #       account.balance.should eq(Money.new(50, :USD))
+        #       expect(account.balance).to eq(Money.new(50, :USD))
         #     end
         #   end
         #
-        # @see MemoizedHelpers#should
-        # @see MemoizedHelpers#should_not
         # @see MemoizedHelpers#is_expected
         def subject(name=nil, &block)
           if name
@@ -485,12 +412,12 @@ EOS
         #       subject { Thing.new }
         #
         #       it "is not invoked implicitly" do
-        #         Thing.count.should eq(0)
+        #         expect(Thing.count).to eq(0)
         #       end
         #
         #       it "can be invoked explicitly" do
         #         subject
-        #         Thing.count.should eq(1)
+        #         expect(Thing.count).to eq(1)
         #       end
         #     end
         #
@@ -498,12 +425,12 @@ EOS
         #       subject!(:thing) { Thing.new }
         #
         #       it "is invoked implicitly" do
-        #         Thing.count.should eq(1)
+        #         expect(Thing.count).to eq(1)
         #       end
         #
         #       it "returns memoized version on first invocation" do
         #         subject
-        #         Thing.count.should eq(1)
+        #         expect(Thing.count).to eq(1)
         #       end
         #     end
         #   end
@@ -540,39 +467,22 @@ EOS
 
       # @private
       def self.define_helpers_on(example_group)
-        example_group.__send__(:include, module_for(example_group))
+        example_group.include(module_for(example_group))
       end
 
-      if Module.method(:const_defined?).arity == 1 # for 1.8
-        # @private
-        #
-        # Gets the named constant or yields.
-        # On 1.8, const_defined? / const_get do not take into
-        # account the inheritance hierarchy.
-        # :nocov:
-        def self.get_constant_or_yield(example_group, name)
-          if example_group.const_defined?(name)
-            example_group.const_get(name)
-          else
-            yield
-          end
-        end
-        # :nocov:
-      else
-        # @private
-        #
-        # Gets the named constant or yields.
-        # On 1.9, const_defined? / const_get take into account the
-        # the inheritance by default, and accept an argument to
-        # disable this behavior. It's important that we don't
-        # consider inheritance here; each example group level that
-        # uses a `let` should get its own `LetDefinitions` module.
-        def self.get_constant_or_yield(example_group, name)
-          if example_group.const_defined?(name, (check_ancestors = false))
-            example_group.const_get(name, check_ancestors)
-          else
-            yield
-          end
+      # @private
+      #
+      # Gets the named constant or yields.
+      # const_defined? / const_get take into account the
+      # the inheritance by default, and accept an argument to
+      # disable this behavior. It's important that we don't
+      # consider inheritance here; each example group level that
+      # uses a `let` should get its own `LetDefinitions` module.
+      def self.get_constant_or_yield(example_group, name)
+        if example_group.const_defined?(name, false)
+          example_group.const_get(name, false)
+        else
+          yield
         end
       end
     end