Remove assorted older rubies workarounds

Author: pirj

lib/rspec/support/spec.rb

@@ -48,7 +48,7 @@ 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 ENV['NO_COVERAGE']
         return if RUBY_ENGINE != 'ruby' || RSpec::Support::OS.windows?
 
         # Don't load it when we're running a single isolated

lib/rspec/support/spec/library_wide_checks.rb

@@ -64,7 +64,7 @@ def load_all_files(files, preamble, postamble=nil)
 
     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
 
@@ -115,14 +115,6 @@ def have_successful_no_warnings_output
   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 } }
 

spec/rspec/support/differ_spec.rb

@@ -287,34 +287,32 @@ def inspect; "<BrokenObject>"; end
           expect(diff).to be_diffed_as(expected_diff)
         end
 
-        unless RUBY_VERSION == '1.8.7' # We can't count on the ordering of the hash on 1.8.7...
-          it "outputs unified diff message for hashes inside arrays with differing key orders" do
-            expected = [{ :foo => 'bar', :baz => 'quux', :metasyntactic => 'variable', :delta => 'charlie', :width =>'quite wide' }]
-            actual   = [{ :metasyntactic => 'variable', :delta => 'charlotte', :width =>'quite wide', :foo => 'bar' }]
+        it "outputs unified diff message for hashes inside arrays with differing key orders" do
+          expected = [{ :foo => 'bar', :baz => 'quux', :metasyntactic => 'variable', :delta => 'charlie', :width =>'quite wide' }]
+          actual   = [{ :metasyntactic => 'variable', :delta => 'charlotte', :width =>'quite wide', :foo => 'bar' }]
 
-            expected_diff = dedent(<<-'EOD')
-              |
-              |@@ -1,4 +1,5 @@
-              |-[{:delta=>"charlotte",
-              |+[{:baz=>"quux",
-              |+  :delta=>"charlie",
-              |   :foo=>"bar",
-              |   :metasyntactic=>"variable",
-              |   :width=>"quite wide"}]
-              |
-            EOD
+          expected_diff = dedent(<<-'EOD')
+            |
+            |@@ -1,4 +1,5 @@
+            |-[{:delta=>"charlotte",
+            |+[{:baz=>"quux",
+            |+  :delta=>"charlie",
+            |   :foo=>"bar",
+            |   :metasyntactic=>"variable",
+            |   :width=>"quite wide"}]
+            |
+          EOD
 
-            diff = differ.diff(expected,actual)
-            expect(diff).to be_diffed_as(expected_diff)
-          end
+          diff = differ.diff(expected,actual)
+          expect(diff).to be_diffed_as(expected_diff)
         end
 
         it 'outputs unified diff message of two hashes with differing encoding', :failing_on_appveyor do
           expected_diff = dedent(<<-"EOD")
             |
             |@@ #{one_line_header} @@
             |-"a" => "a",
-            |#{ (RUBY_VERSION.to_f > 1.8) ?  %Q{+"ö" => "ö"} : '+"\303\266" => "\303\266"' },
+            |+"ö" => "ö",
             |
           EOD
 
@@ -327,7 +325,7 @@ def inspect; "<BrokenObject>"; end
             |
             |@@ #{one_line_header} @@
             |-:a => "a",
-            |#{ (RUBY_VERSION.to_f > 1.8) ?  %Q{+\"한글\" => \"한글2\"} : '+"\355\225\234\352\270\200" => "\355\225\234\352\270\2002"' },
+            |+\"한글\" => \"한글2\",
             |
           EOD
 

spec/rspec/support/encoded_string_spec.rb

@@ -72,26 +72,16 @@ module RSpec::Support
           }.to raise_error(Encoding::ConverterNotFoundError)
         end
 
-        # See comment above ENCODE_UNCONVERTABLE_BYTES in encoded_string.rb
-        # for why the behavior differs by (MRI) Ruby version.
-        if RUBY_VERSION < '2.1'
-          it 'does nothing' do
-            resulting_string = build_encoded_string(string, no_converter_encoding).to_s
-            expected_string  = forced_encoding("\x80", no_converter_encoding)
-            expect(resulting_string).to be_identical_string(expected_string).with_same_encoding
-          end
-        else
-          it 'forces the encoding and replaces invalid characters with the REPLACE string' do
-            resulting_string = build_encoded_string(string, no_converter_encoding).to_s
-            expected_string  = forced_encoding(EncodedString::REPLACE, no_converter_encoding)
-            expect(resulting_string).to be_identical_string(expected_string).with_same_encoding
-          end
+        it 'forces the encoding and replaces invalid characters with the REPLACE string' do
+          resulting_string = build_encoded_string(string, no_converter_encoding).to_s
+          expected_string  = forced_encoding(EncodedString::REPLACE, no_converter_encoding)
+          expect(resulting_string).to be_identical_string(expected_string).with_same_encoding
+        end
 
-          it 'does not mutate the input string' do
-            expect {
-              build_encoded_string(string, no_converter_encoding)
-            }.not_to change { [string, string.encoding] }
-          end
+        it 'does not mutate the input string' do
+          expect {
+            build_encoded_string(string, no_converter_encoding)
+          }.not_to change { [string, string.encoding] }
         end
       end
 

spec/rspec/support/object_formatter_spec.rb

@@ -22,25 +22,17 @@ module Support
 
         it 'formats those objects within the hash output, at any level of nesting' do
           formatted = ObjectFormatter.format(input)
-
-          if RUBY_VERSION == '1.8.7'
-            # We can't count on the ordering of the hash on 1.8.7...
-            expect(formatted).to include(%Q{"key"=>#{formatted_time}}, %Q{#{formatted_time}=>"value"}, %Q{"nested"=>{"key"=>#{formatted_time}}})
-          else
-            expect(formatted).to eq(%Q{{"key"=>#{formatted_time}, #{formatted_time}=>"value", "nested"=>{"key"=>#{formatted_time}}}})
-          end
+          expect(formatted).to eq(%Q{{"key"=>#{formatted_time}, #{formatted_time}=>"value", "nested"=>{"key"=>#{formatted_time}}}})
         end
       end
 
-      unless RUBY_VERSION == '1.8.7' # We can't count on the ordering of the hash on 1.8.7...
-        context 'with a hash object' do
-          let(:input) { { :c => "ccc", :a => "aaa", "b" => 'bbb' } }
-          let(:expected) { '{:a=>"aaa", "b"=>"bbb", :c=>"ccc"}' }
+      context 'with a hash object' do
+        let(:input) { { :c => "ccc", :a => "aaa", "b" => 'bbb' } }
+        let(:expected) { '{:a=>"aaa", "b"=>"bbb", :c=>"ccc"}' }
 
-          it 'sorts keys to ensure objects are always displayed the same way' do
-            formatted = ObjectFormatter.format(input)
-            expect(formatted).to eq expected
-          end
+        it 'sorts keys to ensure objects are always displayed the same way' do
+          formatted = ObjectFormatter.format(input)
+          expect(formatted).to eq expected
         end
       end
 
@@ -222,14 +214,8 @@ def self.to_s
           end
         end
 
-        if RUBY_VERSION == '1.9.2'
-          it 'produces an #inspect-like output without object id' do
-            expect(output).to eq('#<BasicObject:->')
-          end
-        else
-          it "produces an output emulating MRI's #inspect-like output generated by C implementation" do
-            expect(output).to match(/\A#<BasicObject:0x[0-9a-f]{14,16}>\z/)
-          end
+        it "produces an output emulating MRI's #inspect-like output generated by C implementation" do
+          expect(output).to match(/\A#<BasicObject:0x[0-9a-f]{14,16}>\z/)
         end
       end
 

spec/rspec/support/ruby_features_spec.rb

@@ -112,14 +112,10 @@ def ripper_can_parse_source_referencing_keyword_arguments?
             require 'ripper'
             # It doesn't matter if keyword arguments don't exist.
             if Ruby.mri? || Ruby.jruby? || Ruby.truffleruby?
-              if RUBY_VERSION < '2.0'
-                true
-              else
-                begin
-                  !::Ripper.sexp('def a(**kw_args); end').nil?
-                rescue NoMethodError
-                  false
-                end
+              begin
+                !::Ripper.sexp('def a(**kw_args); end').nil?
+              rescue NoMethodError
+                false
               end
             end
           end

spec/rspec/support/spec/in_sub_process_spec.rb

@@ -10,7 +10,7 @@ module NotIsolated
     expect(defined? NotIsolated).to be_nil
   end
 
-  if Process.respond_to?(:fork) && !(RUBY_PLATFORM == 'java' && RUBY_VERSION == '1.8.7')
+  if Process.respond_to?(:fork)
 
     it 'returns the result of sub process' do
       expect(in_sub_process { :foo }).to eq(:foo)

spec/rspec/support/spec/shell_out_spec.rb

@@ -13,10 +13,8 @@
     _, _, good_status = shell_out("ruby", "-e", '3 + 3')
     expect(good_status.exitstatus).to eq(0)
 
-    unless RUBY_VERSION.to_f < 1.9 # except 1.8...
-      _, _, bad_status = shell_out("ruby", "-e", 'boom')
-      expect(bad_status.exitstatus).to eq(1)
-    end
+    _, _, bad_status = shell_out("ruby", "-e", 'boom')
+    expect(bad_status.exitstatus).to eq(1)
   end
 
   it 'can shell out to ruby with the current load path' do

spec/rspec/support/spec/stderr_splitter_spec.rb

@@ -28,9 +28,6 @@
     #     NotImplementedError: pressed?() function is unimplemented on this machine
     stderr_methods = stderr.methods.select { |method| stderr.respond_to?(method) }
 
-    # On 2.2, there's a weird issue where stderr sometimes responds to `birthtime` and sometimes doesn't...
-    stderr_methods -= [:birthtime] if RUBY_VERSION =~ /^2\.2/
-
     # No idea why, but on our AppVeyor windows builds it doesn't respond to these...
     stderr_methods -= [:close_on_exec?, :close_on_exec=] if RSpec::Support::OS.windows?
 

spec/rspec/support_spec.rb

@@ -65,7 +65,7 @@ def method_missing(name, *args, &block)
         }.to raise_error(NameError)
       end
 
-      context "for a BasicObject subclass", :if => RUBY_VERSION.to_f > 1.8 do
+      context "for a BasicObject subclass" do
         let(:basic_class) do
           Class.new(BasicObject) do
             def foo