rspec-support 3.13.6 → 4.0.0.beta1

data/lib/rspec/support/ruby_features.rb

@@ -18,6 +18,14 @@ module RSpec
       def windows_file_path?
         ::File::ALT_SEPARATOR == '\\'
       end
+
+      def macos?
+        !!(RbConfig::CONFIG['host_os']&.downcase =~ /darwin/)
+      end
+
+      def apple_silicon?
+        macos? && !!(RbConfig::CONFIG['host_cpu'] =~ /arm64|aarch64/)
+      end
     end
 
     # @api private
@@ -34,16 +42,8 @@ module RSpec
         @jruby_version ||= ComparableVersion.new(JRUBY_VERSION)
       end
 
-      def jruby_9000?
-        jruby? && JRUBY_VERSION >= '9.0.0.0'
-      end
-
       def rbx?
-        defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-      end
-
-      def non_mri?
-        !mri?
+        !!defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
       end
 
       def mri?
@@ -51,7 +51,7 @@ module RSpec
       end
 
       def truffleruby?
-        defined?(RUBY_ENGINE) && RUBY_ENGINE == 'truffleruby'
+        !!defined?(RUBY_ENGINE) && RUBY_ENGINE == 'truffleruby'
       end
     end
 
@@ -62,36 +62,16 @@ module RSpec
     module RubyFeatures
     module_function
 
-      if Ruby.jruby? && RUBY_VERSION.to_f < 1.9
-        # On JRuby 1.7 `--1.8` mode, `Process.respond_to?(:fork)` returns true,
-        # but when you try to fork, it raises an error:
-        #   NotImplementedError: fork is not available on this platform
-        #
-        # When we drop support for JRuby 1.7 and/or Ruby 1.8, we can drop
-        # this special case.
-        def fork_supported?
-          false
-        end
-      else
-        def fork_supported?
-          Process.respond_to?(:fork)
-        end
+      def fork_supported?
+        Process.respond_to?(:fork)
       end
 
-      def optional_and_splat_args_supported?
-        Method.method_defined?(:parameters)
-      end
-
-      def caller_locations_supported?
-        respond_to?(:caller_locations, true)
-      end
-
-      if Exception.method_defined?(:cause)
-        def supports_exception_cause?
+      if Exception.method_defined?(:detailed_message)
+        def supports_exception_detailed_message?
           true
         end
       else
-        def supports_exception_cause?
+        def supports_exception_detailed_message?
           false
         end
       end
@@ -106,116 +86,16 @@ module RSpec
         end
       end
 
-      if RUBY_VERSION.to_f >= 3.0
-        # https://rubyreferences.github.io/rubychanges/3.0.html#keyword-arguments-are-now-fully-separated-from-positional-arguments
-        def kw_arg_separation?
-          true
-        end
-      else
-        def kw_arg_separation?
-          false
-        end
-      end
-
-      if RUBY_VERSION.to_f >= 2.7
-        def supports_taint?
-          false
-        end
-      else
-        def supports_taint?
-          true
-        end
-      end
-      ripper_requirements = [ComparableVersion.new(RUBY_VERSION) >= '1.9.2']
-
-      ripper_requirements.push(false) if Ruby.rbx?
-
-      if Ruby.jruby?
-        ripper_requirements.push(Ruby.jruby_version >= '1.7.5')
-        # Ripper on JRuby 9.0.0.0.rc1 - 9.1.8.0 reports wrong line number
-        # or cannot parse source including `:if`.
-        # Ripper on JRuby 9.x.x.x < 9.1.17.0 can't handle keyword arguments
-        # Neither can JRuby 9.2, e.g. < 9.2.1.0
-        ripper_requirements.push(!Ruby.jruby_version.between?('9.0.0.0.rc1', '9.2.0.0'))
-      end
-
       # TruffleRuby disables ripper due to low performance
-      ripper_requirements.push(false) if Ruby.truffleruby?
-
-      if ripper_requirements.all?
-        def ripper_supported?
-          true
-        end
-      else
+      if Ruby.rbx? || Ruby.truffleruby?
         def ripper_supported?
           false
         end
-      end
-
-      def distincts_kw_args_from_positional_hash?
-        RUBY_VERSION >= '3.0.0'
-      end
-
-      if Ruby.mri?
-        def kw_args_supported?
-          RUBY_VERSION >= '2.0.0'
-        end
-
-        def required_kw_args_supported?
-          RUBY_VERSION >= '2.1.0'
-        end
-
-        def supports_rebinding_module_methods?
-          RUBY_VERSION.to_i >= 2
-        end
       else
-        # RBX / JRuby et al support is unknown for keyword arguments
-        begin
-          eval("o = Object.new; def o.m(a: 1); end;"\
-               " raise SyntaxError unless o.method(:m).parameters.include?([:key, :a])")
-
-          def kw_args_supported?
-            true
-          end
-        rescue SyntaxError
-          def kw_args_supported?
-            false
-          end
-        end
-
-        begin
-          eval("o = Object.new; def o.m(a: ); end;"\
-               "raise SyntaxError unless o.method(:m).parameters.include?([:keyreq, :a])")
-
-          def required_kw_args_supported?
-            true
-          end
-        rescue SyntaxError
-          def required_kw_args_supported?
-            false
-          end
-        end
-
-        begin
-          Module.new { def foo; end }.instance_method(:foo).bind(Object.new)
-
-          def supports_rebinding_module_methods?
-            true
-          end
-        rescue TypeError
-          def supports_rebinding_module_methods?
-            false
-          end
+        def ripper_supported?
+          true
         end
       end
-
-      def module_refinement_supported?
-        Module.method_defined?(:refine) || Module.private_method_defined?(:refine)
-      end
-
-      def module_prepends_supported?
-        Module.method_defined?(:prepend) || Module.private_method_defined?(:prepend)
-      end
     end
   end
 end

data/lib/rspec/support/source.rb

@@ -25,18 +25,9 @@ module RSpec
         new(source, path)
       end
 
-      if String.method_defined?(:encoding)
-        def initialize(source_string, path=nil)
-          @source = RSpec::Support::EncodedString.new(source_string, Encoding.default_external)
-          @path = path ? File.expand_path(path) : '(string)'
-        end
-      else # for 1.8.7
-        # :nocov:
-        def initialize(source_string, path=nil)
-          @source = RSpec::Support::EncodedString.new(source_string)
-          @path = path ? File.expand_path(path) : '(string)'
-        end
-        # :nocov:
+      def initialize(source_string, path=nil)
+        @source = RSpec::Support::EncodedString.new(source_string, Encoding.default_external)
+        @path = path ? File.expand_path(path) : '(string)'
       end
 
       def lines

data/lib/rspec/support/spec/coverage.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'rspec/support'
+
+RSpec::Support.require_rspec_support "ruby_features"
+
+module RSpec
+  module Support
+    module Spec
+      module Coverage
+        def self.setup(&block)
+          # Simplecov emits some ruby warnings when loaded, so silence them.
+          old_verbose, $VERBOSE = $VERBOSE, false
+
+          return if ENV['NO_COVERAGE']
+          return if RUBY_ENGINE != 'ruby' || RSpec::Support::OS.windows?
+
+          # Don't load it when we're running a single isolated
+          # test file rather than the whole suite.
+          #
+          # The extra defined check is so that script/rspec_with_simplecov can reuse
+          # this logic.
+          return if defined?(RSpec.configuration) && RSpec.configuration.files_to_run.one?
+
+          require 'simplecov'
+          start(&block)
+        rescue LoadError
+          warn "Simplecov could not be loaded"
+        ensure
+          $VERBOSE = old_verbose
+        end
+
+        def self.start(&block)
+          SimpleCov.start do
+            add_filter "bundle/"
+            add_filter "tmp/"
+            add_filter do |source_file|
+              # Filter out `spec` directory except when it is under `lib`
+              # (as is the case in rspec-support)
+              source_file.filename.include?('/spec/') && !source_file.filename.include?('/lib/')
+            end
+
+            instance_eval(&block) if block
+          end
+        end
+        private_class_method :start
+      end
+    end
+  end
+end

data/lib/rspec/support/spec/in_sub_process.rb

@@ -3,7 +3,7 @@
 module RSpec
   module Support
     module InSubProcess
-      if Process.respond_to?(:fork) && !(Ruby.jruby? && RUBY_VERSION == '1.8.7')
+      if Process.respond_to?(:fork)
 
         UnmarshableObject = Struct.new(:error)
 

data/lib/rspec/support/spec/library_wide_checks.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rspec/support/spec/shell_out'
+RSpec::Support.require_rspec_support 'ruby_features'
 
 module RSpec
   module Support
@@ -10,7 +11,7 @@ module RSpec
       def check_for_tab_characters(filename)
         failing_lines = []
         File.readlines(filename).each_with_index do |line, number|
-          failing_lines << number + 1 if line =~ /\t/
+          failing_lines << (number + 1) if line =~ /\t/
         end
 
         return if failing_lines.empty?
@@ -21,7 +22,7 @@ module RSpec
         failing_lines = []
         File.readlines(filename).each_with_index do |line, number|
           next if line =~ /^\s+#.*\s+\n$/
-          failing_lines << number + 1 if line =~ /\s+\n$/
+          failing_lines << (number + 1) if line =~ /\s+\n$/
         end
 
         return if failing_lines.empty?
@@ -50,7 +51,7 @@ RSpec.shared_examples_for "library wide checks" do |lib, options|
     extract_regex = /#{Regexp.escape(directory) + File::SEPARATOR}(.+)\.rb$/
 
     # We sort to ensure the files are loaded in a consistent order, regardless
-    # of OS. Otherwise, it could load in a different order on Travis than
+    # of OS. Otherwise, it could load in a different order on CI than
     # locally, and potentially trigger a "circular require considered harmful"
     # warning or similar.
     files.sort.map { |file| file[extract_regex, 1] }
@@ -66,7 +67,7 @@ RSpec.shared_examples_for "library wide checks" do |lib, options|
 
     stdout, stderr, status = with_env 'NO_COVERAGE' => '1' do
       options = %w[ -w ]
-      options << "--disable=gem" if RUBY_VERSION.to_f >= 1.9 && RSpec::Support::Ruby.mri?
+      options << "--disable=gem" if RSpec::Support::Ruby.mri?
       run_ruby_with_current_load_path(command, *options)
     end
 
@@ -111,20 +112,16 @@ RSpec.shared_examples_for "library wide checks" do |lib, options|
   end
 
   it "issues no warnings when the spec files are loaded", :slow do
+    if RSpec::Support::Ruby.jruby? && RSpec::Support::OS.apple_silicon?
+      pending "JRuby on MacOS Apple Silicon outputs warnings due to lack of native console (and stty) support per https://github.com/jruby/jruby/issues/8271"
+    end
+
     expect(spec_file_results).to have_successful_no_warnings_output
   end
 
   it 'only loads a known set of stdlibs so gem authors are forced ' \
      'to load libs they use to have passing specs', :slow do
     loaded_features = @loaded_feature_lines.split("\n")
-    if RUBY_VERSION == '1.8.7'
-      # On 1.8.7, $" returns the relative require path if that was used
-      # to require the file. LIB_REGEX will not match the relative version
-      # since it has a `/lib` prefix. Here we deal with this by expanding
-      # relative files relative to the $LOAD_PATH dir (lib).
-      Dir.chdir("lib") { loaded_features.map! { |f| File.expand_path(f) } }
-    end
-
     loaded_features.reject! { |feature| RSpec::CallerFilter::LIB_REGEX =~ feature }
     loaded_features.reject! { |feature| allowed_loaded_feature_regexps.any? { |r| r =~ feature } }
 

data/lib/rspec/support/spec/shell_out.rb

@@ -18,26 +18,9 @@ module RSpec
         end
       end
 
-      if Open3.respond_to?(:capture3) # 1.9+
-        def shell_out(*command)
-          stdout, stderr, status = Open3.capture3(*command)
-          return stdout, filter(stderr), status
-        end
-      else # 1.8.7
-        # popen3 doesn't provide the exit status so we fake it out.
-        FakeProcessStatus = Struct.new(:exitstatus)
-
-        def shell_out(*command)
-          stdout = stderr = nil
-
-          Open3.popen3(*command) do |_in, out, err|
-            stdout = out.read
-            stderr = err.read
-          end
-
-          status = FakeProcessStatus.new(0)
-          return stdout, filter(stderr), status
-        end
+      def shell_out(*command)
+        stdout, stderr, status = Open3.capture3(*command)
+        return stdout, filter(stderr), status
       end
 
       def run_ruby_with_current_load_path(ruby_command, *flags)
@@ -61,13 +44,9 @@ module RSpec
           %r{bundler/source/rubygems},
           # Ignore bundler + rubygems warning.
           %r{site_ruby/\d\.\d\.\d/rubygems},
-          %r{site_ruby/\d\.\d\.\d/bundler},
           %r{jruby-\d\.\d\.\d+\.\d/lib/ruby/stdlib/rubygems},
-          %r{lib/rubygems/custom_require},
           # This is required for windows for some reason
           %r{lib/bundler/rubygems},
-          # This is a JRuby file that generates warnings on 9.0.3.0
-          %r{lib/ruby/stdlib/jar},
           # This is a JRuby file that generates warnings on 9.1.7.0
           %r{org/jruby/RubyKernel\.java},
           # This is a JRuby gem that generates warnings on 9.1.7.0
@@ -84,7 +63,6 @@ module RSpec
           # Ignore some JRuby errors for gems
           %r{jruby/\d\.\d(\.\d)?/gems/aruba},
           %r{jruby/\d\.\d(\.\d)?/gems/ffi},
-          %r{warning: encoding options not supported in 1\.8},
           # Ignore errors from asdf
           %r{\.asdf/installs},
         ]

data/lib/rspec/support/spec/stderr_splitter.rb

@@ -11,9 +11,8 @@ module RSpec
         @last_line = nil
       end
 
-      respond_to_name = (::RUBY_VERSION.to_f < 1.9) ? :respond_to? : :respond_to_missing?
-      define_method respond_to_name do |*args|
-        @orig_stderr.respond_to?(*args) || super(*args)
+      def respond_to_missing?(*args)
+        @orig_stderr.respond_to?(*args) || super
       end
 
       def method_missing(name, *args, &block)
@@ -21,6 +20,10 @@ module RSpec
         @orig_stderr.__send__(name, *args, &block)
       end
 
+      def clone
+        StdErrSplitter.new(@orig_stderr.clone)
+      end
+
       def ==(other)
         @orig_stderr == other
       end
@@ -30,26 +33,10 @@ module RSpec
         @orig_stderr.reopen(*args)
       end
 
-      # To work around JRuby error:
-      # can't convert RSpec::Support::StdErrSplitter into String
-      def to_io
-        @orig_stderr.to_io
-      end
-
-      # To work around JRuby error:
-      # TypeError: $stderr must have write method, RSpec::StdErrSplitter given
       def write(line)
+        # Ignore warnings coming from gems, specifically Rails
         return if line =~ %r{^\S+/gems/\S+:\d+: warning:} # http://rubular.com/r/kqeUIZOfPG
 
-        # Ruby 2.7.0 warnings from keyword arguments span multiple lines, extend check above
-        # to look for the next line.
-        return if @last_line =~ %r{^\S+/gems/\S+:\d+: warning:} &&
-                  line =~ %r{warning: The called method .* is defined here}
-
-        # Ruby 2.7.0 complains about hashes used in place of keyword arguments
-        # Aruba 0.14.2 uses this internally triggering that here
-        return if line =~ %r{lib/ruby/2\.7\.0/fileutils\.rb:622: warning:}
-
         @orig_stderr.write(line)
         @output_tracker.write(line)
       ensure

data/lib/rspec/support/spec/string_matcher.rb

@@ -6,36 +6,26 @@ require 'rspec/matchers'
 # which also relies on EncodedString. Instead, confirm the
 # strings have the same bytes.
 RSpec::Matchers.define :be_identical_string do |expected|
-  if String.method_defined?(:encoding)
-    match do
-      expected_encoding? &&
-        actual.bytes.to_a == expected.bytes.to_a
-    end
-
-    failure_message do
-      "expected\n#{actual.inspect} (#{actual.encoding.name}) to be identical to\n"\
-        "#{expected.inspect} (#{expected.encoding.name})\n"\
-        "The exact bytes are printed below for more detail:\n"\
-        "#{actual.bytes.to_a}\n"\
-        "#{expected.bytes.to_a}\n"\
-    end
+  match do
+    expected_encoding? &&
+      actual.bytes.to_a == expected.bytes.to_a
+  end
 
-    # Depends on chaining :with_same_encoding for it to
-    # check for string encoding.
-    def expected_encoding?
-      if defined?(@expect_same_encoding) && @expect_same_encoding
-        actual.encoding == expected.encoding
-      else
-        true
-      end
-    end
-  else
-    match do
-      actual.split(//) == expected.split(//)
-    end
+  failure_message do
+    "expected\n#{actual.inspect} (#{actual.encoding.name}) to be identical to\n" \
+      "#{expected.inspect} (#{expected.encoding.name})\n" \
+      "The exact bytes are printed below for more detail:\n" \
+      "#{actual.bytes.to_a}\n" \
+      "#{expected.bytes.to_a}\n" \
+  end
 
-    failure_message do
-      "expected\n#{actual.inspect} to be identical to\n#{expected.inspect}\n"
+  # Depends on chaining :with_same_encoding for it to
+  # check for string encoding.
+  def expected_encoding?
+    if defined?(@expect_same_encoding) && @expect_same_encoding
+      actual.encoding == expected.encoding
+    else
+      true
     end
   end
 

data/lib/rspec/support/spec.rb

@@ -3,8 +3,8 @@
 require 'rspec/support'
 require 'rspec/support/spec/in_sub_process'
 
+RSpec::Support.require_rspec_support "spec/coverage"
 RSpec::Support.require_rspec_support "spec/deprecation_helpers"
-RSpec::Support.require_rspec_support "spec/diff_helpers"
 RSpec::Support.require_rspec_support "spec/with_isolated_stderr"
 RSpec::Support.require_rspec_support "spec/stderr_splitter"
 RSpec::Support.require_rspec_support "spec/formatting_support"
@@ -19,6 +19,8 @@ RSpec.configure do |c|
   c.include RSpec::Support::FormattingSupport
   c.include RSpec::Support::InSubProcess
 
+  c.warnings = :all
+
   unless defined?(Debugger) # debugger causes warnings when used
     c.before do
       warning_preventer.reset!
@@ -42,43 +44,3 @@ RSpec.configure do |c|
     meta[:pending] ||= "This spec fails on Windows CI and needs someone to fix it."
   end if RSpec::Support::OS.windows? && ENV['CI']
 end
-
-module RSpec
-  module Support
-    module Spec
-      def self.setup_simplecov(&block)
-        # Simplecov emits some ruby warnings when loaded, so silence them.
-        old_verbose, $VERBOSE = $VERBOSE, false
-
-        return if ENV['NO_COVERAGE'] || RUBY_VERSION < '1.9.3'
-        return if RUBY_ENGINE != 'ruby' || RSpec::Support::OS.windows?
-
-        # Don't load it when we're running a single isolated
-        # test file rather than the whole suite.
-        return if RSpec.configuration.files_to_run.one?
-
-        require 'simplecov'
-        start_simplecov(&block)
-      rescue LoadError
-        warn "Simplecov could not be loaded"
-      ensure
-        $VERBOSE = old_verbose
-      end
-
-      def self.start_simplecov(&block)
-        SimpleCov.start do
-          add_filter "bundle/"
-          add_filter "tmp/"
-          add_filter do |source_file|
-            # Filter out `spec` directory except when it is under `lib`
-            # (as is the case in rspec-support)
-            source_file.filename.include?('/spec/') && !source_file.filename.include?('/lib/')
-          end
-
-          instance_eval(&block) if block
-        end
-      end
-      private_class_method :start_simplecov
-    end
-  end
-end

data/lib/rspec/support/version.rb

@@ -3,7 +3,7 @@
 module RSpec
   module Support
     module Version
-      STRING = '3.13.6'
+      STRING = '4.0.0.beta1'
     end
   end
 end

data/lib/rspec/support/with_keywords_when_needed.rb

@@ -10,26 +10,17 @@ module RSpec
 
       module_function
 
-      if RSpec::Support::RubyFeatures.kw_args_supported?
-        # Remove this in RSpec 4 in favour of explicitly passed in kwargs where
-        # this is used. Works around a warning in Ruby 2.7
-
-        def class_exec(klass, *args, &block)
-          if MethodSignature.new(block).has_kw_args_in?(args)
-            binding.eval(<<-CODE, __FILE__, __LINE__)
-            kwargs = args.pop
-            klass.class_exec(*args, **kwargs, &block)
-            CODE
-          else
-            klass.class_exec(*args, &block)
-          end
-        end
-        ruby2_keywords :class_exec if respond_to?(:ruby2_keywords, true)
-      else
-        def class_exec(klass, *args, &block)
+      # Remove this in RSpec 4 in favour of explicitly passed in kwargs where
+      # this is used. Works around a warning in Ruby 2.7
+      def class_exec(klass, *args, &block)
+        if MethodSignature.new(block).has_kw_args_in?(args)
+          kwargs = args.pop
+          klass.class_exec(*args, **kwargs, &block)
+        else
           klass.class_exec(*args, &block)
         end
       end
+      ruby2_keywords :class_exec if respond_to?(:ruby2_keywords, true)
     end
   end
 end