Remove $SAFE support for 2.7

Author: JonRowe

spec/rspec/core/formatters/html_snippet_extractor_spec.rb

@@ -12,11 +12,13 @@ module Formatters
           expect(RSpec::Core::Formatters::HtmlSnippetExtractor.new.lines_around("blech", 8)).to eq("# Couldn't get snippet for blech")
         end
 
-        it "falls back on a default message when it gets a security error" do
-          message = with_safe_set_to_level_that_triggers_security_errors do
-            RSpec::Core::Formatters::HtmlSnippetExtractor.new.lines_around("blech".dup.taint, 8)
+        if RSpec::Support::RubyFeatures.supports_taint?
+          it "falls back on a default message when it gets a security error" do
+            message = with_safe_set_to_level_that_triggers_security_errors do
+              RSpec::Core::Formatters::HtmlSnippetExtractor.new.lines_around("blech".dup.taint, 8)
+            end
+            expect(message).to eq("# Couldn't get snippet for blech")
           end
-          expect(message).to eq("# Couldn't get snippet for blech")
         end
 
         describe "snippet extraction" do

spec/support/helper_methods.rb

@@ -14,24 +14,32 @@ def ignoring_warnings
     result
   end
 
-  def with_safe_set_to_level_that_triggers_security_errors
-    result = nil
+  # In Ruby 2.7 taint was removed and has no effect, whilst SAFE warns that it
+  # has no effect and will become a normal varible in 3.0.
+  if RUBY_VERSION >= '2.7'
+    def with_safe_set_to_level_that_triggers_security_errors
+      yield
+    end
+  else
+    def with_safe_set_to_level_that_triggers_security_errors
+      result = nil
 
-    orig_safe = $SAFE
-    Thread.new do
-      ignoring_warnings { $SAFE = SAFE_LEVEL_THAT_TRIGGERS_SECURITY_ERRORS }
-      result = yield
-    end.join
+      orig_safe = $SAFE
+      Thread.new do
+        ignoring_warnings { $SAFE = SAFE_LEVEL_THAT_TRIGGERS_SECURITY_ERRORS }
+        result = yield
+      end.join
 
-    # $SAFE is not supported on Rubinius
-    # In Ruby 2.6, $SAFE became a global variable; previously it was local to a thread.
-    unless defined?(Rubinius) || SAFE_IS_GLOBAL_VARIABLE
-      # $SAFE should not have changed in this thread.
-      expect($SAFE).to eql orig_safe
-    end
+      # $SAFE is not supported on Rubinius
+      # In Ruby 2.6, $SAFE became a global variable; previously it was local to a thread.
+      unless defined?(Rubinius) || SAFE_IS_GLOBAL_VARIABLE
+        # $SAFE should not have changed in this thread.
+        expect($SAFE).to eql orig_safe
+      end
 
-    result
-  ensure
-    $SAFE = orig_safe if orig_safe && SAFE_IS_GLOBAL_VARIABLE
+      result
+    ensure
+      $SAFE = orig_safe if orig_safe && SAFE_IS_GLOBAL_VARIABLE
+    end
   end
 end