3 files changed, 12 insertions, 10 deletions
diff --git a/spec/ruby/core/array/fetch_values_spec.rb b/spec/ruby/core/array/fetch_values_spec.rb
index 075dcc7a52..cf377b3b71 100644
--- a/spec/ruby/core/array/fetch_values_spec.rb
+++ b/spec/ruby/core/array/fetch_values_spec.rb
@@ -21,7 +21,7 @@ describe "Array#fetch_values" do
 
     describe "with unmatched indexes" do
       it "raises a index error if no block is provided" do
-        -> { @array.fetch_values(0, 1, 44) }.should raise_error(IndexError)
+        -> { @array.fetch_values(0, 1, 44) }.should raise_error(IndexError, "index 44 outside of array bounds: -3...3")
       end
 
       it "returns the default value from block" do
@@ -42,8 +42,14 @@ describe "Array#fetch_values" do
       @array.fetch_values(obj).should == [:c]
     end
 
+    it "does not support a Range object as argument" do
+      -> {
+        @array.fetch_values(1..2)
+      }.should raise_error(TypeError, "no implicit conversion of Range into Integer")
+    end
+
     it "raises a TypeError when the passed argument can't be coerced to Integer" do
-      -> { [].fetch_values("cat") }.should raise_error(TypeError)
+      -> { [].fetch_values("cat") }.should raise_error(TypeError, "no implicit conversion of String into Integer")
     end
   end
 end
diff --git a/spec/ruby/core/array/pack/shared/basic.rb b/spec/ruby/core/array/pack/shared/basic.rb
index ebd9f75d9d..a63f64d296 100644
--- a/spec/ruby/core/array/pack/shared/basic.rb
+++ b/spec/ruby/core/array/pack/shared/basic.rb
@@ -33,19 +33,15 @@ describe :array_pack_basic_non_float, shared: true do
   end
 
   ruby_version_is ""..."3.3" do
-    # https://bugs.ruby-lang.org/issues/19150
-    # NOTE: it's just a plan of the Ruby core team
     it "warns that a directive is unknown" do
       # additional directive ('a') is required for the X directive
-      -> { [@obj, @obj].pack("a R" + pack_format) }.should complain(/unknown pack directive 'R'/)
-      -> { [@obj, @obj].pack("a 0" + pack_format) }.should complain(/unknown pack directive '0'/)
-      -> { [@obj, @obj].pack("a :" + pack_format) }.should complain(/unknown pack directive ':'/)
+      -> { [@obj, @obj].pack("a K" + pack_format) }.should complain(/unknown pack directive 'K' in 'a K#{pack_format}'/)
+      -> { [@obj, @obj].pack("a 0" + pack_format) }.should complain(/unknown pack directive '0' in 'a 0#{pack_format}'/)
+      -> { [@obj, @obj].pack("a :" + pack_format) }.should complain(/unknown pack directive ':' in 'a :#{pack_format}'/)
     end
   end
 
   ruby_version_is "3.3" do
-    # https://bugs.ruby-lang.org/issues/19150
-    # NOTE: Added this case just to not forget about the decision in the ticket
     it "raise ArgumentError when a directive is unknown" do
       # additional directive ('a') is required for the X directive
       -> { [@obj, @obj].pack("a R" + pack_format) }.should raise_error(ArgumentError, /unknown pack directive 'R'/)
diff --git a/spec/ruby/core/array/shared/unshift.rb b/spec/ruby/core/array/shared/unshift.rb
index 4941e098f6..9e0fe7556a 100644
--- a/spec/ruby/core/array/shared/unshift.rb
+++ b/spec/ruby/core/array/shared/unshift.rb
@@ -49,7 +49,7 @@ describe :array_unshift, shared: true do
     -> { ArraySpecs.frozen_array.send(@method) }.should raise_error(FrozenError)
   end
 
-  # https://github.com/oracle/truffleruby/issues/2772
+  # https://github.com/truffleruby/truffleruby/issues/2772
   it "doesn't rely on Array#[]= so it can be overridden" do
     subclass = Class.new(Array) do
       def []=(*)