1 files changed, 29 insertions, 72 deletions
diff --git a/spec/ruby/language/safe_spec.rb b/spec/ruby/language/safe_spec.rb
index f3a7efc953..062381d729 100644
--- a/spec/ruby/language/safe_spec.rb
+++ b/spec/ruby/language/safe_spec.rb
@@ -2,10 +2,8 @@ require_relative '../spec_helper'
 
 describe "The $SAFE variable" do
   ruby_version_is ""..."2.7" do
-    ruby_version_is "2.6" do
-      after :each do
-        $SAFE = 0
-      end
+    after :each do
+      $SAFE = 0
     end
 
     it "is 0 by default" do
@@ -39,24 +37,12 @@ describe "The $SAFE variable" do
       end
     end
 
-    ruby_version_is ""..."2.6" do
-      it "cannot be set to values below 0" do
-        -> {
-          proc {
-            $SAFE = -100
-          }.call
-        }.should raise_error(SecurityError, /tried to downgrade safe level from 0 to -100/)
-      end
-    end
-
-    ruby_version_is "2.6" do
-      it "raises ArgumentError when set to values below 0" do
-        -> {
-          proc {
-            $SAFE = -100
-          }.call
-        }.should raise_error(ArgumentError, "$SAFE should be >= 0")
-      end
+    it "raises ArgumentError when set to values below 0" do
+      -> {
+        proc {
+          $SAFE = -100
+        }.call
+      }.should raise_error(ArgumentError, "$SAFE should be >= 0")
     end
 
     it "cannot be set to values above 4" do
@@ -67,61 +53,32 @@ describe "The $SAFE variable" do
       }.should raise_error(ArgumentError, /\$SAFE=2 to 4 are obsolete/)
     end
 
-    ruby_version_is ""..."2.6" do
-      it "cannot be manually lowered" do
-        proc {
-          $SAFE = 1
-          -> {
-            $SAFE = 0
-          }.should raise_error(SecurityError, /tried to downgrade safe level from 1 to 0/)
-        }.call
-      end
-
-      it "is automatically lowered when leaving a proc" do
-        $SAFE.should == 0
-        proc {
-          $SAFE = 1
-        }.call
-        $SAFE.should == 0
-      end
-
-      it "is automatically lowered when leaving a lambda" do
-        $SAFE.should == 0
-        -> {
-          $SAFE = 1
-        }.call
-        $SAFE.should == 0
-      end
+    it "can be manually lowered" do
+      $SAFE = 1
+      $SAFE = 0
+      $SAFE.should == 0
     end
 
-    ruby_version_is "2.6" do
-      it "can be manually lowered" do
+    it "is not Proc local" do
+      $SAFE.should == 0
+      proc {
         $SAFE = 1
-        $SAFE = 0
-        $SAFE.should == 0
-      end
-
-      it "is not Proc local" do
-        $SAFE.should == 0
-        proc {
-          $SAFE = 1
-        }.call
-        $SAFE.should == 1
-      end
-
-      it "is not lambda local" do
-        $SAFE.should == 0
-        -> {
-          $SAFE = 1
-        }.call
-        $SAFE.should == 1
-      end
+      }.call
+      $SAFE.should == 1
+    end
 
-      it "is global like regular global variables" do
-        Thread.new { $SAFE }.value.should == 0
+    it "is not lambda local" do
+      $SAFE.should == 0
+      -> {
         $SAFE = 1
-        Thread.new { $SAFE }.value.should == 1
-      end
+      }.call
+      $SAFE.should == 1
+    end
+
+    it "is global like regular global variables" do
+      Thread.new { $SAFE }.value.should == 0
+      $SAFE = 1
+      Thread.new { $SAFE }.value.should == 1
     end
 
     it "can be read when default from Thread#safe_level" do