1 files changed, 13 insertions, 31 deletions
diff --git a/spec/ruby/core/kernel/untrusted_spec.rb b/spec/ruby/core/kernel/untrusted_spec.rb
index 5347c90093..ea36d6c98c 100644
--- a/spec/ruby/core/kernel/untrusted_spec.rb
+++ b/spec/ruby/core/kernel/untrusted_spec.rb
@@ -2,38 +2,14 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#untrusted?" do
-  ruby_version_is ''...'2.7' do
-    it "returns the untrusted status of an object" do
-      o = mock('o')
-      o.should_not.untrusted?
-      o.untrust
-      o.should.untrusted?
-    end
-
-    it "has no effect on immediate values" do
-      a = nil
-      b = true
-      c = false
-      a.untrust
-      b.untrust
-      c.untrust
-      a.should_not.untrusted?
-      b.should_not.untrusted?
-      c.should_not.untrusted?
-    end
-
-    it "has effect on immediate values" do
-      d = 1
-      -> { d.untrust }.should_not raise_error(RuntimeError)
-    end
-  end
-
-  ruby_version_is "2.7"..."3.0" do
+  ruby_version_is ""..."3.2" do
     it "is a no-op" do
-      o = mock('o')
-      o.should_not.untrusted?
-      o.untrust
-      o.should_not.untrusted?
+      suppress_warning do
+        o = mock('o')
+        o.should_not.untrusted?
+        o.untrust
+        o.should_not.untrusted?
+      end
     end
 
     it "warns in verbose mode" do
@@ -43,4 +19,10 @@ describe "Kernel#untrusted?" do
       }.should complain(/Object#untrusted\? is deprecated and will be removed in Ruby 3.2/, verbose: true)
     end
   end
+
+  ruby_version_is "3.2" do
+    it "has been removed" do
+      Object.new.should_not.respond_to?(:untrusted?)
+    end
+  end
 end