Update to ruby/spec@c3206f6

42 files changed, 480 insertions, 128 deletions

diff --git a/spec/ruby/core/array/assoc_spec.rb b/spec/ruby/core/array/assoc_spec.rb
index af95528281..f0be3de795 100644
--- a/spec/ruby/core/array/assoc_spec.rb
+++ b/spec/ruby/core/array/assoc_spec.rb
@@ -37,4 +37,16 @@ describe "Array#assoc" do
     a.assoc(s1.first).should equal(s1)
     a.assoc(s2.first).should equal(s2)
   end
+
+  it "calls to_ary on non-array elements" do
+    s1 = [1, 2]
+    s2 = ArraySpecs::ArrayConvertible.new(2, 3)
+    a = [s1, s2]
+
+    s1.should_not_receive(:to_ary)
+    a.assoc(s1.first).should equal(s1)
+
+    a.assoc(2).should == [2, 3]
+    s2.called.should equal(:to_ary)
+  end
 end
diff --git a/spec/ruby/core/array/rassoc_spec.rb b/spec/ruby/core/array/rassoc_spec.rb
index 62fbd40611..ed2851f195 100644
--- a/spec/ruby/core/array/rassoc_spec.rb
+++ b/spec/ruby/core/array/rassoc_spec.rb
@@ -35,4 +35,16 @@ describe "Array#rassoc" do
 
     [[1, :foobar, o], [2, o, 1], [3, mock('foo')]].rassoc(key).should == [2, o, 1]
   end
+
+  it "does not call to_ary on non-array elements" do
+    s1 = [1, 2]
+    s2 = ArraySpecs::ArrayConvertible.new(2, 3)
+    a = [s1, s2]
+
+    s1.should_not_receive(:to_ary)
+    a.rassoc(2).should equal(s1)
+
+    s2.should_not_receive(:to_ary)
+    a.rassoc(3).should equal(nil)
+  end
 end
diff --git a/spec/ruby/core/exception/full_message_spec.rb b/spec/ruby/core/exception/full_message_spec.rb
index e15649ca75..4fad369936 100644
--- a/spec/ruby/core/exception/full_message_spec.rb
+++ b/spec/ruby/core/exception/full_message_spec.rb
@@ -46,6 +46,49 @@ describe "Exception#full_message" do
     full_message[0].should.end_with?("': Some runtime error (RuntimeError)\n")
   end
 
+  describe "includes details about whether an exception was handled" do
+    describe "RuntimeError" do
+      it "should report as unhandled if message is empty" do
+        err = RuntimeError.new("")
+
+        err.full_message.should =~ /unhandled exception/
+        err.full_message(highlight: true).should =~ /unhandled exception/
+        err.full_message(highlight: false).should =~ /unhandled exception/
+      end
+
+      it "should not report as unhandled if the message is not empty" do
+        err = RuntimeError.new("non-empty")
+
+        err.full_message.should !~ /unhandled exception/
+        err.full_message(highlight: true).should !~ /unhandled exception/
+        err.full_message(highlight: false).should !~ /unhandled exception/
+      end
+
+      it "should not report as unhandled if the message is nil" do
+        err = RuntimeError.new(nil)
+
+        err.full_message.should !~ /unhandled exception/
+        err.full_message(highlight: true).should !~ /unhandled exception/
+        err.full_message(highlight: false).should !~ /unhandled exception/
+      end
+
+      it "should not report as unhandled if the message is not specified" do
+        err = RuntimeError.new()
+
+        err.full_message.should !~ /unhandled exception/
+        err.full_message(highlight: true).should !~ /unhandled exception/
+        err.full_message(highlight: false).should !~ /unhandled exception/
+      end
+    end
+
+    describe "generic Error" do
+      it "should not report as unhandled in any event" do
+        StandardError.new("").full_message.should !~ /unhandled exception/
+        StandardError.new("non-empty").full_message.should !~ /unhandled exception/
+      end
+    end
+  end
+
   it "shows the exception class at the end of the first line of the message when the message contains multiple lines" do
     begin
       line = __LINE__; raise "first line\nsecond line"
diff --git a/spec/ruby/core/file/new_spec.rb b/spec/ruby/core/file/new_spec.rb
index 3e2641aed3..1e82a070b1 100644
--- a/spec/ruby/core/file/new_spec.rb
+++ b/spec/ruby/core/file/new_spec.rb
@@ -100,7 +100,7 @@ describe "File.new" do
     File.should.exist?(@file)
   end
 
-  it "raises an Errorno::EEXIST if the file exists when create a new file with File::CREAT|File::EXCL" do
+  it "raises an Errno::EEXIST if the file exists when create a new file with File::CREAT|File::EXCL" do
     -> { @fh = File.new(@file, File::CREAT|File::EXCL) }.should raise_error(Errno::EEXIST)
   end
 
diff --git a/spec/ruby/core/file/open_spec.rb b/spec/ruby/core/file/open_spec.rb
index 4c41f70e12..6bfc16bbf9 100644
--- a/spec/ruby/core/file/open_spec.rb
+++ b/spec/ruby/core/file/open_spec.rb
@@ -354,7 +354,7 @@ describe "File.open" do
     end
   end
 
-  it "raises an Errorno::EEXIST if the file exists when open with File::CREAT|File::EXCL" do
+  it "raises an Errno::EEXIST if the file exists when open with File::CREAT|File::EXCL" do
     -> {
       File.open(@file, File::CREAT|File::EXCL) do |f|
         f.puts("writing")
@@ -423,7 +423,7 @@ describe "File.open" do
       }.should raise_error(IOError)
     end
 
-    it "raises an Errorno::EEXIST if the file exists when open with File::RDONLY|File::TRUNC" do
+    it "raises an Errno::EEXIST if the file exists when open with File::RDONLY|File::TRUNC" do
       -> {
         File.open(@file, File::RDONLY|File::TRUNC) do |f|
           f.puts("writing").should == nil
@@ -441,7 +441,7 @@ describe "File.open" do
       }.should raise_error(Errno::EINVAL)
     end
 
-    it "raises an Errorno::EEXIST if the file exists when open with File::RDONLY|File::TRUNC" do
+    it "raises an Errno::EEXIST if the file exists when open with File::RDONLY|File::TRUNC" do
       -> {
         File.open(@file, File::RDONLY|File::TRUNC) do |f|
           f.puts("writing").should == nil
diff --git a/spec/ruby/core/kernel/Integer_spec.rb b/spec/ruby/core/kernel/Integer_spec.rb
index c37733e88d..74dd3e0dd2 100644
--- a/spec/ruby/core/kernel/Integer_spec.rb
+++ b/spec/ruby/core/kernel/Integer_spec.rb
@@ -586,6 +586,21 @@ describe :kernel_integer_string_base, shared: true do
     Integer("777", obj).should == 0777
   end
 
+  # https://bugs.ruby-lang.org/issues/19349
+  ruby_version_is ''...'3.3' do
+    it "ignores the base if it is not an integer and does not respond to #to_i" do
+      Integer("777", "8").should == 777
+    end
+  end
+
+  ruby_version_is '3.3' do
+    it "raises a TypeError if it is not an integer and does not respond to #to_i" do
+      -> {
+        Integer("777", "8")
+      }.should raise_error(TypeError, "no implicit conversion of String into Integer")
+    end
+  end
+
   describe "when passed exception: false" do
     describe "and valid argument" do
       it "returns an Integer number" do
diff --git a/spec/ruby/core/method/parameters_spec.rb b/spec/ruby/core/method/parameters_spec.rb
index 0f730fe013..7d2b37fac7 100644
--- a/spec/ruby/core/method/parameters_spec.rb
+++ b/spec/ruby/core/method/parameters_spec.rb
@@ -7,6 +7,7 @@ describe "Method#parameters" do
     def one_keyrest(**a); end
 
     def one_keyreq(a:); end
+    def one_nokey(**nil); end
 
     def one_splat_one_req(*a,b); end
     def one_splat_two_req(*a,b,c); end
@@ -15,6 +16,7 @@ describe "Method#parameters" do
     def one_opt_with_stabby(a=-> b { true }); end
 
     def one_unnamed_splat(*); end
+    def one_unnamed_keyrest(**); end
 
     def one_splat_one_block(*args, &block)
       local_is_not_parameter = {}
@@ -178,6 +180,11 @@ describe "Method#parameters" do
     m.parameters.should == [[:keyreq,:a]]
   end
 
+  it "returns [[:nokey]] for a method with a single **nil parameter" do
+    m = MethodSpecs::Methods.instance_method(:one_nokey)
+    m.parameters.should == [[:nokey]]
+  end
+
   it "works with ->(){} as the value of an optional argument" do
     m = MethodSpecs::Methods.instance_method(:one_opt_with_stabby)
     m.parameters.should == [[:opt,:a]]
@@ -225,10 +232,15 @@ describe "Method#parameters" do
   end
 
   ruby_version_is '3.2' do
-    it "adds * rest arg for \"star\" argument" do
+    it "adds rest arg with name * for \"star\" argument" do
       m = MethodSpecs::Methods.new
       m.method(:one_unnamed_splat).parameters.should == [[:rest, :*]]
     end
+
+    it "adds keyrest arg with ** as a name for \"double star\" argument" do
+      m = MethodSpecs::Methods.new
+      m.method(:one_unnamed_keyrest).parameters.should == [[:keyrest, :**]]
+    end
   end
 
   ruby_version_is ''...'3.2' do
@@ -236,6 +248,23 @@ describe "Method#parameters" do
       m = MethodSpecs::Methods.new
       m.method(:one_unnamed_splat).parameters.should == [[:rest]]
     end
+
+    it "adds nameless keyrest arg for \"double star\" argument" do
+      m = MethodSpecs::Methods.new
+      m.method(:one_unnamed_keyrest).parameters.should == [[:keyrest]]
+    end
+  end
+
+  ruby_version_is '3.1' do
+    it "adds block arg with name & for anonymous block argument" do
+      object = Object.new
+
+      eval(<<~RUBY).should == [[:block, :&]]
+        def object.foo(&)
+        end
+        object.method(:foo).parameters
+      RUBY
+    end
   end
 
   it "returns the args and block for a splat and block argument" do
diff --git a/spec/ruby/core/proc/parameters_spec.rb b/spec/ruby/core/proc/parameters_spec.rb
index 1ffaf17315..2a4dcc36b3 100644
--- a/spec/ruby/core/proc/parameters_spec.rb
+++ b/spec/ruby/core/proc/parameters_spec.rb
@@ -21,7 +21,7 @@ describe "Proc#parameters" do
   end
 
   ruby_version_is "3.2" do
-    it "sets the first element of each sub-Array to :req if argument would be required if a lambda if lambda keyword used" do
+    it "sets the first element of each sub-Array to :req for required argument if lambda keyword used" do
       proc {|x| }.parameters(lambda: true).first.first.should == :req
       proc {|y,*x| }.parameters(lambda: true).first.first.should == :req
     end
@@ -91,19 +91,33 @@ describe "Proc#parameters" do
     proc {|&block| }.parameters.first.last.should == :block
   end
 
-  it "ignores unnamed rest args" do
+  it "ignores unnamed rest arguments" do
     -> x {}.parameters.should == [[:req, :x]]
   end
 
   ruby_version_is '3.2' do
-    it "adds * rest arg for \"star\" argument" do
-      -> x, * {}.parameters.should == [[:req, :x], [:rest, :*]]
+    it "adds rest arg with name * for \"star\" argument" do
+      -> * {}.parameters.should == [[:rest, :*]]
+    end
+
+    it "adds keyrest arg with ** as a name for \"double star\" argument" do
+      -> ** {}.parameters.should == [[:keyrest, :**]]
     end
   end
 
   ruby_version_is ''...'3.2' do
     it "adds nameless rest arg for \"star\" argument" do
-      -> x, * {}.parameters.should == [[:req, :x], [:rest]]
+      -> * {}.parameters.should == [[:rest]]
+    end
+
+    it "adds nameless keyrest arg for \"double star\" argument" do
+      -> ** {}.parameters.should == [[:keyrest]]
+    end
+  end
+
+  ruby_version_is '3.1' do
+    it "adds block arg with name & for anonymous block argument" do
+      eval('-> & {}.parameters').should == [[:block, :&]]
     end
   end
 
diff --git a/spec/ruby/language/numbered_parameters_spec.rb b/spec/ruby/language/numbered_parameters_spec.rb
index 9d2bd7ff92..3a35cf1465 100644
--- a/spec/ruby/language/numbered_parameters_spec.rb
+++ b/spec/ruby/language/numbered_parameters_spec.rb
@@ -82,6 +82,19 @@ describe "Numbered parameters" do
     lambda { _9 }.arity.should == 9
   end
 
+  it "affects block parameters" do
+    -> { _1 }.parameters.should == [[:req, :_1]]
+    -> { _2 }.parameters.should == [[:req, :_1], [:req, :_2]]
+
+    proc { _1 }.parameters.should == [[:opt, :_1]]
+    proc { _2 }.parameters.should == [[:opt, :_1], [:opt, :_2]]
+  end
+
+  it "affects binding local variables" do
+    -> { _1; binding.local_variables }.call("a").should == [:_1]
+    -> { _2; binding.local_variables }.call("a", "b").should == [:_1, :_2]
+  end
+
   it "does not work in methods" do
     obj = Object.new
     def obj.foo; _1 end
diff --git a/spec/ruby/language/singleton_class_spec.rb b/spec/ruby/language/singleton_class_spec.rb
index 7512f0eb39..9d037717b2 100644
--- a/spec/ruby/language/singleton_class_spec.rb
+++ b/spec/ruby/language/singleton_class_spec.rb
@@ -307,4 +307,11 @@ describe "Frozen properties" do
     o.freeze
     klass.frozen?.should == true
   end
+
+  it "will be unfrozen if the frozen object is cloned with freeze set to false" do
+    o = Object.new
+    o.freeze
+    o2 = o.clone(freeze: false)
+    o2.singleton_class.frozen?.should == false
+  end
 end
diff --git a/spec/ruby/library/date/iso8601_spec.rb b/spec/ruby/library/date/iso8601_spec.rb
index a29652014e..af66845a6b 100644
--- a/spec/ruby/library/date/iso8601_spec.rb
+++ b/spec/ruby/library/date/iso8601_spec.rb
@@ -22,6 +22,18 @@ describe "Date.iso8601" do
     d.should == Date.civil(-4712, 1, 1)
   end
 
+  it "raises a Date::Error if the argument is a invalid Date" do
+    -> {
+      Date.iso8601('invalid')
+    }.should raise_error(Date::Error, "invalid date")
+  end
+
+  it "raises a Date::Error when passed a nil" do
+    -> {
+      Date.iso8601(nil)
+    }.should raise_error(Date::Error, "invalid date")
+  end
+
   it "raises a TypeError when passed an Object" do
     -> { Date.iso8601(Object.new) }.should raise_error(TypeError)
   end
@@ -32,4 +44,13 @@ describe "Date._iso8601" do
     h = Date._iso8601('invalid')
     h.should == {}
   end
+
+  it "returns an empty hash if the argument is nil" do
+    h = Date._iso8601(nil)
+    h.should == {}
+  end
+
+  it "raises a TypeError when passed an Object" do
+    -> { Date._iso8601(Object.new) }.should raise_error(TypeError)
+  end
 end
diff --git a/spec/ruby/library/date/shared/parse.rb b/spec/ruby/library/date/shared/parse.rb
index 1015285e04..40af908386 100644
--- a/spec/ruby/library/date/shared/parse.rb
+++ b/spec/ruby/library/date/shared/parse.rb
@@ -13,7 +13,7 @@ describe :date_parse, shared: true do
     d.day.should == 23
   end
 
-  it "can parse a 'mmm DD YYYY' string into a Date object" do
+  it "can parse a 'DD mmm YYYY' string into a Date object" do
     d = Date.parse("23#{@sep}feb#{@sep}2008")
     d.year.should == 2008
     d.month.should == 2
@@ -42,7 +42,7 @@ describe :date_parse, shared: true do
     d.should == Date.civil(2005, 11, 5)
   end
 
-  it "can parse a year, day and month name into a Date object" do
+  it "can parse a day, month name and year into a Date object" do
     d = Date.parse("5th#{@sep}november#{@sep}2005")
     d.should == Date.civil(2005, 11, 5)
   end
diff --git a/spec/ruby/library/date/shared/parse_eu.rb b/spec/ruby/library/date/shared/parse_eu.rb
index ecb15e3c0e..3819524a57 100644
--- a/spec/ruby/library/date/shared/parse_eu.rb
+++ b/spec/ruby/library/date/shared/parse_eu.rb
@@ -7,28 +7,28 @@ describe :date_parse_eu, shared: true do
     d.day.should == 1
   end
 
-  it "can parse a MM-DD-YYYY string into a Date object" do
+  it "can parse a DD-MM-YYYY string into a Date object" do
     d = Date.parse("10#{@sep}01#{@sep}2007")
     d.year.should == 2007
     d.month.should == 1
     d.day.should == 10
   end
 
-  it "can parse a MM-DD-YY string into a Date object" do
+  it "can parse a YY-MM-DD string into a Date object" do
     d = Date.parse("10#{@sep}01#{@sep}07")
     d.year.should == 2010
     d.month.should == 1
     d.day.should == 7
   end
 
-  it "can parse a MM-DD-YY string into a Date object NOT using the year digits as 20XX" do
+  it "can parse a YY-MM-DD string into a Date object NOT using the year digits as 20XX" do
     d = Date.parse("10#{@sep}01#{@sep}07", false)
     d.year.should == 10
     d.month.should == 1
     d.day.should == 7
   end
 
-  it "can parse a MM-DD-YY string into a Date object using the year digits as 20XX" do
+  it "can parse a YY-MM-DD string into a Date object using the year digits as 20XX" do
     d = Date.parse("10#{@sep}01#{@sep}07", true)
     d.year.should == 2010
     d.month.should == 1
diff --git a/spec/ruby/library/date/shared/parse_us.rb b/spec/ruby/library/date/shared/parse_us.rb
index 7be62b1af1..17e2fc96c1 100644
--- a/spec/ruby/library/date/shared/parse_us.rb
+++ b/spec/ruby/library/date/shared/parse_us.rb
@@ -6,28 +6,28 @@ describe :date_parse_us, shared: true do
     d.day.should == 1
   end
 
-  it "parses a MM#{@sep}DD#{@sep}YYYY string into a Date object" do
+  it "parses a DD#{@sep}MM#{@sep}YYYY string into a Date object" do
     d = Date.parse("10#{@sep}01#{@sep}2007")
     d.year.should == 2007
     d.month.should == 1
     d.day.should == 10
   end
 
-  it "parses a MM#{@sep}DD#{@sep}YY string into a Date object" do
+  it "parses a YY#{@sep}MM#{@sep}DD string into a Date object" do
     d = Date.parse("10#{@sep}01#{@sep}07")
     d.year.should == 2010
     d.month.should == 1
     d.day.should == 7
   end
 
-  it "parses a MM#{@sep}DD#{@sep}YY string into a Date object NOT using the year digits as 20XX" do
+  it "parses a YY#{@sep}MM#{@sep}DD string into a Date object NOT using the year digits as 20XX" do
     d = Date.parse("10#{@sep}01#{@sep}07", false)
     d.year.should == 10
     d.month.should == 1
     d.day.should == 7
   end
 
-  it "parses a MM#{@sep}DD#{@sep}YY string into a Date object using the year digits as 20XX" do
+  it "parses a YY#{@sep}MM#{@sep}DD string into a Date object using the year digits as 20XX" do
     d = Date.parse("10#{@sep}01#{@sep}07", true)
     d.year.should == 2010
     d.month.should == 1
diff --git a/spec/ruby/library/digest/instance/shared/update.rb b/spec/ruby/library/digest/instance/shared/update.rb
index dccc8f80df..17779e54a4 100644
--- a/spec/ruby/library/digest/instance/shared/update.rb
+++ b/spec/ruby/library/digest/instance/shared/update.rb
@@ -3,6 +3,6 @@ describe :digest_instance_update, shared: true do
     c = Class.new do
       include Digest::Instance
     end
-    -> { c.new.update("test") }.should raise_error(RuntimeError)
+    -> { c.new.send(@method, "test") }.should raise_error(RuntimeError)
   end
 end
diff --git a/spec/ruby/library/etc/uname_spec.rb b/spec/ruby/library/etc/uname_spec.rb
new file mode 100644
index 0000000000..a42558f593
--- /dev/null
+++ b/spec/ruby/library/etc/uname_spec.rb
@@ -0,0 +1,14 @@
+require_relative '../../spec_helper'
+require 'etc'
+
+describe "Etc.uname" do
+  it "returns a Hash with the documented keys" do
+    uname = Etc.uname
+    uname.should be_kind_of(Hash)
+    uname.should.key?(:sysname)
+    uname.should.key?(:nodename)
+    uname.should.key?(:release)
+    uname.should.key?(:version)
+    uname.should.key?(:machine)
+  end
+end
diff --git a/spec/ruby/library/openssl/fixed_length_secure_compare_spec.rb b/spec/ruby/library/openssl/fixed_length_secure_compare_spec.rb
new file mode 100644
index 0000000000..5a2ca168b5
--- /dev/null
+++ b/spec/ruby/library/openssl/fixed_length_secure_compare_spec.rb
@@ -0,0 +1,42 @@
+require_relative '../../spec_helper'
+require 'openssl'
+
+describe "OpenSSL.fixed_length_secure_compare" do
+  it "returns true for two strings with the same content" do
+    input1 = "the quick brown fox jumps over the lazy dog"
+    input2 = "the quick brown fox jumps over the lazy dog"
+    OpenSSL.fixed_length_secure_compare(input1, input2).should be_true
+  end
+
+  it "returns false for two strings of equal size with different content" do
+    input1 = "the quick brown fox jumps over the lazy dog"
+    input2 = "the lazy dog jumps over the quick brown fox"
+    OpenSSL.fixed_length_secure_compare(input1, input2).should be_false
+  end
+
+  it "converts both arguments to strings using #to_str" do
+    input1 = mock("input1")
+    input1.should_receive(:to_str).and_return("the quick brown fox jumps over the lazy dog")
+    input2 = mock("input2")
+    input2.should_receive(:to_str).and_return("the quick brown fox jumps over the lazy dog")
+    OpenSSL.fixed_length_secure_compare(input1, input2).should be_true
+  end
+
+  it "does not accept arguments that are not string and cannot be coerced into strings" do
+    -> {
+      OpenSSL.fixed_length_secure_compare("input1", :input2)
+    }.should raise_error(TypeError, 'no implicit conversion of Symbol into String')
+
+    -> {
+      OpenSSL.fixed_length_secure_compare(Object.new, "input2")
+    }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+  end
+
+  it "raises an ArgumentError for two strings of different size" do
+    input1 = "the quick brown fox jumps over the lazy dog"
+    input2 = "the quick brown fox"
+    -> {
+      OpenSSL.fixed_length_secure_compare(input1, input2)
+    }.should raise_error(ArgumentError, 'inputs must be of equal length')
+  end
+end
diff --git a/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb b/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb
index 000aa0c113..40f8597275 100644
--- a/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb
+++ b/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb
@@ -154,23 +154,6 @@ describe "OpenSSL::KDF.pbkdf2_hmac" do
     }.should raise_error(ArgumentError, 'missing keywords: :salt, :iterations, :length, :hash')
   end
 
-=begin
-  guard -> { OpenSSL::OPENSSL_VERSION_NUMBER < 0x30000000 } do
-    it "treats 0 or less iterations as a single iteration" do
-      salt = "\x00".b * 16
-      length = 16
-      hash = "sha1"
-
-      # "Any iter less than 1 is treated as a single iteration."
-      key0 = OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, iterations: 0)
-      key_negative = OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, iterations: -1)
-      key1 = OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, iterations: 1)
-      key0.should == key1
-      key_negative.should == key1
-    end
-  end
-=end
-
   guard -> { OpenSSL::OPENSSL_VERSION_NUMBER >= 0x30000000 } do
     it "raises an OpenSSL::KDF::KDFError for 0 or less iterations" do
       -> {
diff --git a/spec/ruby/library/openssl/secure_compare_spec.rb b/spec/ruby/library/openssl/secure_compare_spec.rb
new file mode 100644
index 0000000000..cec48e01e7
--- /dev/null
+++ b/spec/ruby/library/openssl/secure_compare_spec.rb
@@ -0,0 +1,38 @@
+require_relative '../../spec_helper'
+require 'openssl'
+
+describe "OpenSSL.secure_compare" do
+  it "returns true for two strings with the same content" do
+    input1 = "the quick brown fox jumps over the lazy dog"
+    input2 = "the quick brown fox jumps over the lazy dog"
+    OpenSSL.secure_compare(input1, input2).should be_true
+  end
+
+  it "returns false for two strings with different content" do
+    input1 = "the quick brown fox jumps over the lazy dog"
+    input2 = "the lazy dog jumps over the quick brown fox"
+    OpenSSL.secure_compare(input1, input2).should be_false
+  end
+
+  it "converts both arguments to strings using #to_str, but adds equality check for the original objects" do
+    input1 = mock("input1")
+    input1.should_receive(:to_str).and_return("the quick brown fox jumps over the lazy dog")
+    input2 = mock("input2")
+    input2.should_receive(:to_str).and_return("the quick brown fox jumps over the lazy dog")
+    OpenSSL.secure_compare(input1, input2).should be_false
+
+    input = mock("input")
+    input.should_receive(:to_str).twice.and_return("the quick brown fox jumps over the lazy dog")
+    OpenSSL.secure_compare(input, input).should be_true
+  end
+
+  it "does not accept arguments that are not string and cannot be coerced into strings" do
+    -> {
+      OpenSSL.secure_compare("input1", :input2)
+    }.should raise_error(TypeError, 'no implicit conversion of Symbol into String')
+
+    -> {
+      OpenSSL.secure_compare(Object.new, "input2")
+    }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+  end
+end
diff --git a/spec/ruby/library/openssl/x509/name/verify_spec.rb b/spec/ruby/library/openssl/x509/store/verify_spec.rb
index 6dcfc99466..6a6a53d992 100644
--- a/spec/ruby/library/openssl/x509/name/verify_spec.rb
+++ b/spec/ruby/library/openssl/x509/store/verify_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../../../spec_helper'
 require 'openssl'
 
-describe "OpenSSL::X509::Name.verify" do
+describe "OpenSSL::X509::Store#verify" do
   it "returns true for valid certificate" do
     key = OpenSSL::PKey::RSA.new 2048
     cert = OpenSSL::X509::Certificate.new
diff --git a/spec/ruby/library/yaml/dump_spec.rb b/spec/ruby/library/yaml/dump_spec.rb
index 3107a8f51d..ea94b2f856 100644
--- a/spec/ruby/library/yaml/dump_spec.rb
+++ b/spec/ruby/library/yaml/dump_spec.rb
@@ -1,17 +1,21 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
 
-# TODO: WTF is this using a global?
+require 'yaml'
+
 describe "YAML.dump" do
+  before :each do
+    @test_file = tmp("yaml_test_file")
+  end
+
   after :each do
-    rm_r $test_file
+    rm_r @test_file
   end
 
   it "converts an object to YAML and write result to io when io provided" do
-    File.open($test_file, 'w' ) do |io|
+    File.open(@test_file, 'w' ) do |io|
       YAML.dump( ['badger', 'elephant', 'tiger'], io )
     end
-    YAML.load_file($test_file).should == ['badger', 'elephant', 'tiger']
+    YAML.load_file(@test_file).should == ['badger', 'elephant', 'tiger']
   end
 
   it "returns a string containing dumped YAML when no io provided" do
diff --git a/spec/ruby/library/yaml/dump_stream_spec.rb b/spec/ruby/library/yaml/dump_stream_spec.rb
index 9d30fef819..f0578fa800 100644
--- a/spec/ruby/library/yaml/dump_stream_spec.rb
+++ b/spec/ruby/library/yaml/dump_stream_spec.rb
@@ -1,5 +1,6 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
+
+require 'yaml'
 
 describe "YAML.dump_stream" do
   it "returns a YAML stream containing the objects passed" do
diff --git a/spec/ruby/library/yaml/fixtures/common.rb b/spec/ruby/library/yaml/fixtures/common.rb
deleted file mode 100644
index 895213b844..0000000000
--- a/spec/ruby/library/yaml/fixtures/common.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'yaml'
-
-$test_file = tmp("yaml_test_file")
-$test_parse_file = __dir__ + "/test_yaml.yml"
diff --git a/spec/ruby/library/yaml/load_file_spec.rb b/spec/ruby/library/yaml/load_file_spec.rb
index 2363c08120..4941d0485b 100644
--- a/spec/ruby/library/yaml/load_file_spec.rb
+++ b/spec/ruby/library/yaml/load_file_spec.rb
@@ -1,13 +1,18 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
+
+require 'yaml'
 
 describe "YAML.load_file" do
+  before :each do
+    @test_file = tmp("yaml_test_file")
+  end
+
   after :each do
-    rm_r $test_file
+    rm_r @test_file
   end
 
   it "returns a hash" do
-    File.open($test_file,'w' ){|io| YAML.dump( {"bar"=>2, "car"=>1}, io ) }
-    YAML.load_file($test_file).should == {"bar"=>2, "car"=>1}
+    File.open(@test_file,'w' ){|io| YAML.dump( {"bar"=>2, "car"=>1}, io ) }
+    YAML.load_file(@test_file).should == {"bar"=>2, "car"=>1}
   end
 end
diff --git a/spec/ruby/library/yaml/load_stream_spec.rb b/spec/ruby/library/yaml/load_stream_spec.rb
index 689653c8cd..31bc862f5e 100644
--- a/spec/ruby/library/yaml/load_stream_spec.rb
+++ b/spec/ruby/library/yaml/load_stream_spec.rb
@@ -1,8 +1,9 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
 require_relative 'fixtures/strings'
 require_relative 'shared/each_document'
 
+require 'yaml'
+
 describe "YAML.load_stream" do
   it_behaves_like :yaml_each_document, :load_stream
 end
diff --git a/spec/ruby/library/yaml/parse_file_spec.rb b/spec/ruby/library/yaml/parse_file_spec.rb
index 8c59a2d7ef..7bffcdc62f 100644
--- a/spec/ruby/library/yaml/parse_file_spec.rb
+++ b/spec/ruby/library/yaml/parse_file_spec.rb
@@ -1,8 +1,10 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
 
-describe "YAML#parse_file" do
+require 'yaml'
+
+describe "YAML.parse_file" do
   it "returns a YAML::Syck::Map object after parsing a YAML file" do
-    YAML.parse_file($test_parse_file).should be_kind_of(Psych::Nodes::Document)
+    test_parse_file = fixture __FILE__, "test_yaml.yml"
+    YAML.parse_file(test_parse_file).should be_kind_of(Psych::Nodes::Document)
   end
 end
diff --git a/spec/ruby/library/yaml/parse_spec.rb b/spec/ruby/library/yaml/parse_spec.rb
index d5dbfdcee2..37e2b7fa0a 100644
--- a/spec/ruby/library/yaml/parse_spec.rb
+++ b/spec/ruby/library/yaml/parse_spec.rb
@@ -1,13 +1,14 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
 
-describe "YAML#parse with an empty string" do
+require 'yaml'
+
+describe "YAML.parse with an empty string" do
   it "returns false" do
     YAML.parse('').should be_false
   end
 end
 
-describe "YAML#parse" do
+describe "YAML.parse" do
   before :each do
     @string_yaml = "foo".to_yaml
   end
diff --git a/spec/ruby/library/yaml/shared/each_document.rb b/spec/ruby/library/yaml/shared/each_document.rb
index 999123dc2a..7d32c6001f 100644
--- a/spec/ruby/library/yaml/shared/each_document.rb
+++ b/spec/ruby/library/yaml/shared/each_document.rb
@@ -9,7 +9,8 @@ describe :yaml_each_document, shared: true do
   end
 
   it "works on files" do
-    File.open($test_parse_file, "r") do |file|
+    test_parse_file = fixture __FILE__, "test_yaml.yml"
+    File.open(test_parse_file, "r") do |file|
       YAML.send(@method, file) do |doc|
         doc.should == {"project"=>{"name"=>"RubySpec"}}
       end
diff --git a/spec/ruby/library/yaml/shared/load.rb b/spec/ruby/library/yaml/shared/load.rb
index 185a5a60cd..1ebe08be2c 100644
--- a/spec/ruby/library/yaml/shared/load.rb
+++ b/spec/ruby/library/yaml/shared/load.rb
@@ -1,14 +1,16 @@
-require_relative '../fixtures/common'
 require_relative '../fixtures/strings'
 
+require 'yaml'
+
 describe :yaml_load_safe, shared: true do
   it "returns a document from current io stream when io provided" do
-    File.open($test_file, 'w') do |io|
+    @test_file = tmp("yaml_test_file")
+    File.open(@test_file, 'w') do |io|
       YAML.dump( ['badger', 'elephant', 'tiger'], io )
     end
-    File.open($test_file) { |yf| YAML.send(@method,  yf ) }.should == ['badger', 'elephant', 'tiger']
+    File.open(@test_file) { |yf| YAML.send(@method,  yf ) }.should == ['badger', 'elephant', 'tiger']
   ensure
-    rm_r $test_file
+    rm_r @test_file
   end
 
   it "loads strings" do
diff --git a/spec/ruby/library/yaml/to_yaml_spec.rb b/spec/ruby/library/yaml/to_yaml_spec.rb
index 8e80b02cb4..547009c942 100644
--- a/spec/ruby/library/yaml/to_yaml_spec.rb
+++ b/spec/ruby/library/yaml/to_yaml_spec.rb
@@ -1,7 +1,8 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
 require_relative 'fixtures/example_class'
 
+require 'yaml'
+
 describe "Object#to_yaml" do
 
   it "returns the YAML representation of an Array object" do
@@ -12,13 +13,21 @@ describe "Object#to_yaml" do
     { "a" => "b"}.to_yaml.should match_yaml("--- \na: b\n")
   end
 
-  it "returns the YAML representation of a Class object" do
+  it "returns the YAML representation of an object" do
     YAMLSpecs::Example.new("baz").to_yaml.should match_yaml("--- !ruby/object:YAMLSpecs::Example\nname: baz\n")
   end
 
+  it "returns the YAML representation of a Class object" do
+    YAMLSpecs::Example.to_yaml.should match_yaml("--- !ruby/class 'YAMLSpecs::Example'\n")
+  end
+
+  it "returns the YAML representation of a Module object" do
+    Enumerable.to_yaml.should match_yaml("--- !ruby/module 'Enumerable'\n")
+  end
+
   it "returns the YAML representation of a Date object" do
     require 'date'
-    Date.parse('1997/12/30').to_yaml.should match_yaml("--- 1997-12-30\n")
+    Date.new(1997, 12, 30).to_yaml.should match_yaml("--- 1997-12-30\n")
   end
 
   it "returns the YAML representation of a FalseClass" do
@@ -58,6 +67,11 @@ describe "Object#to_yaml" do
     Person.new("Jane", "female").to_yaml.should match_yaml("--- !ruby/struct:Person\nname: Jane\ngender: female\n")
   end
 
+  it "returns the YAML representation of an unnamed Struct object" do
+    person = Struct.new(:name, :gender)
+    person.new("Jane", "female").to_yaml.should match_yaml("--- !ruby/struct\nname: Jane\ngender: female\n")
+  end
+
   it "returns the YAML representation of a Symbol object" do
     :symbol.to_yaml.should match_yaml("--- :symbol\n")
   end
diff --git a/spec/ruby/optional/capi/array_spec.rb b/spec/ruby/optional/capi/array_spec.rb
index 8e90980c6a..9c35017e21 100644
--- a/spec/ruby/optional/capi/array_spec.rb
+++ b/spec/ruby/optional/capi/array_spec.rb
@@ -343,6 +343,40 @@ describe "C-API Array function" do
     end
   end
 
+  describe "rb_iterate" do
+    it "calls an callback function as a block passed to an method" do
+      s = [1,2,3,4]
+      s2 = @s.rb_iterate(s)
+
+      s2.should == s
+
+      # Make sure they're different objects
+      s2.equal?(s).should be_false
+    end
+
+    it "calls a function with the other function available as a block" do
+      h = {a: 1, b: 2}
+
+      @s.rb_iterate_each_pair(h).sort.should == [1,2]
+    end
+
+    it "calls a function which can yield into the original block" do
+      s2 = []
+
+      o = Object.new
+      def o.each
+        yield 1
+        yield 2
+        yield 3
+        yield 4
+      end
+
+      @s.rb_iterate_then_yield(o) { |x| s2 << x }
+
+      s2.should == [1,2,3,4]
+    end
+  end
+
   describe "rb_block_call" do
     it "calls an callback function as a block passed to an method" do
       s = [1,2,3,4]
diff --git a/spec/ruby/optional/capi/ext/array_spec.c b/spec/ruby/optional/capi/ext/array_spec.c
index 9386239813..8d5005c891 100644
--- a/spec/ruby/optional/capi/ext/array_spec.c
+++ b/spec/ruby/optional/capi/ext/array_spec.c
@@ -196,6 +196,18 @@ static VALUE copy_ary(RB_BLOCK_CALL_FUNC_ARGLIST(el, new_ary)) {
   return rb_ary_push(new_ary, el);
 }
 
+// Suppress deprecations warnings for rb_iterate(), we want to test it while it exists
+RBIMPL_WARNING_PUSH()
+RBIMPL_WARNING_IGNORED(-Wdeprecated-declarations)
+
+static VALUE array_spec_rb_iterate(VALUE self, VALUE ary) {
+  VALUE new_ary = rb_ary_new();
+
+  rb_iterate(rb_each, ary, copy_ary, new_ary);
+
+  return new_ary;
+}
+
 static VALUE array_spec_rb_block_call(VALUE self, VALUE ary) {
   VALUE new_ary = rb_ary_new();
 
@@ -208,6 +220,18 @@ static VALUE sub_pair(RB_BLOCK_CALL_FUNC_ARGLIST(el, holder)) {
   return rb_ary_push(holder, rb_ary_entry(el, 1));
 }
 
+static VALUE each_pair(VALUE obj) {
+  return rb_funcall(obj, rb_intern("each_pair"), 0);
+}
+
+static VALUE array_spec_rb_iterate_each_pair(VALUE self, VALUE obj) {
+  VALUE new_ary = rb_ary_new();
+
+  rb_iterate(each_pair, obj, sub_pair, new_ary);
+
+  return new_ary;
+}
+
 static VALUE array_spec_rb_block_call_each_pair(VALUE self, VALUE obj) {
   VALUE new_ary = rb_ary_new();
 
@@ -221,11 +245,18 @@ static VALUE iter_yield(RB_BLOCK_CALL_FUNC_ARGLIST(el, ary)) {
   return Qnil;
 }
 
+static VALUE array_spec_rb_iterate_then_yield(VALUE self, VALUE obj) {
+  rb_iterate(rb_each, obj, iter_yield, obj);
+  return Qnil;
+}
+
 static VALUE array_spec_rb_block_call_then_yield(VALUE self, VALUE obj) {
   rb_block_call(obj, rb_intern("each"), 0, 0, iter_yield, obj);
   return Qnil;
 }
 
+RBIMPL_WARNING_POP()
+
 static VALUE array_spec_rb_mem_clear(VALUE self, VALUE obj) {
   VALUE ary[1];
   ary[0] = obj;
@@ -283,6 +314,9 @@ void Init_array_spec(void) {
   rb_define_method(cls, "rb_ary_plus", array_spec_rb_ary_plus, 2);
   rb_define_method(cls, "rb_ary_unshift", array_spec_rb_ary_unshift, 2);
   rb_define_method(cls, "rb_assoc_new", array_spec_rb_assoc_new, 2);
+  rb_define_method(cls, "rb_iterate", array_spec_rb_iterate, 1);
+  rb_define_method(cls, "rb_iterate_each_pair", array_spec_rb_iterate_each_pair, 1);
+  rb_define_method(cls, "rb_iterate_then_yield", array_spec_rb_iterate_then_yield, 1);
   rb_define_method(cls, "rb_block_call", array_spec_rb_block_call, 1);
   rb_define_method(cls, "rb_block_call_each_pair", array_spec_rb_block_call_each_pair, 1);
   rb_define_method(cls, "rb_block_call_then_yield", array_spec_rb_block_call_then_yield, 1);
diff --git a/spec/ruby/optional/capi/ext/encoding_spec.c b/spec/ruby/optional/capi/ext/encoding_spec.c
index 3343848b54..4d2ff52ef3 100644
--- a/spec/ruby/optional/capi/ext/encoding_spec.c
+++ b/spec/ruby/optional/capi/ext/encoding_spec.c
@@ -271,12 +271,15 @@ static VALUE encoding_spec_rb_enc_str_asciionly_p(VALUE self, VALUE str) {
   }
 }
 
+RBIMPL_WARNING_PUSH()
+RBIMPL_WARNING_IGNORED(-Wformat-security)
 static VALUE encoding_spec_rb_enc_raise(VALUE self, VALUE encoding, VALUE exception_class, VALUE format) {
   rb_encoding *e = rb_to_encoding(encoding);
   const char *f = RSTRING_PTR(format);
 
   rb_enc_raise(e, exception_class, "%s", f);
 }
+RBIMPL_WARNING_POP()
 
 static VALUE encoding_spec_rb_uv_to_utf8(VALUE self, VALUE buf, VALUE num) {
   int len = rb_uv_to_utf8(RSTRING_PTR(buf), NUM2INT(num));
diff --git a/spec/ruby/optional/capi/ext/object_spec.c b/spec/ruby/optional/capi/ext/object_spec.c
index fbcf6d9962..4c19ec12c7 100644
--- a/spec/ruby/optional/capi/ext/object_spec.c
+++ b/spec/ruby/optional/capi/ext/object_spec.c
@@ -154,28 +154,14 @@ static VALUE object_specs_rb_obj_method(VALUE self, VALUE obj, VALUE method) {
   return rb_obj_method(obj, method);
 }
 
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__clang__) && defined(__has_warning)
-# if __has_warning("-Wdeprecated-declarations")
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wdeprecated-declarations"
-# endif
-#endif
-
 #ifndef RUBY_VERSION_IS_3_2
+// Suppress deprecations warnings for rb_obj_taint(), we want to test it while it exists
+RBIMPL_WARNING_PUSH()
+RBIMPL_WARNING_IGNORED(-Wdeprecated-declarations)
 static VALUE object_spec_rb_obj_taint(VALUE self, VALUE obj) {
   return rb_obj_taint(obj);
 }
-#endif
-
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-# pragma GCC diagnostic pop
-#elif defined(__clang__) && defined(__has_warning)
-# if __has_warning("-Wdeprecated-declarations")
-#  pragma clang diagnostic pop
-# endif
+RBIMPL_WARNING_POP()
 #endif
 
 static VALUE so_require(VALUE self) {
diff --git a/spec/ruby/optional/capi/ext/rbasic_spec.c b/spec/ruby/optional/capi/ext/rbasic_spec.c
index 9178e5f639..26be2fed6d 100644
--- a/spec/ruby/optional/capi/ext/rbasic_spec.c
+++ b/spec/ruby/optional/capi/ext/rbasic_spec.c
@@ -5,6 +5,14 @@
 extern "C" {
 #endif
 
+#ifndef RBASIC_FLAGS
+#define RBASIC_FLAGS(obj) (RBASIC(obj)->flags)
+#endif
+
+#ifndef RBASIC_SET_FLAGS
+#define RBASIC_SET_FLAGS(obj, flags_to_set) (RBASIC(obj)->flags = flags_to_set)
+#endif
+
 #ifndef FL_SHAREABLE
 static const VALUE VISIBLE_BITS = FL_TAINT | FL_FREEZE;
 static const VALUE DATA_VISIBLE_BITS = FL_TAINT | FL_FREEZE | ~(FL_USER0 - 1);
@@ -34,47 +42,53 @@ VALUE rbasic_spec_freeze_flag(VALUE self) {
   return VALUE2NUM(RUBY_FL_FREEZE);
 }
 
-    static VALUE spec_get_flags(const struct RBasic *b, VALUE visible_bits) {
-  VALUE flags = b->flags & visible_bits;
+static VALUE spec_get_flags(VALUE obj, VALUE visible_bits) {
+  VALUE flags = RB_FL_TEST(obj, visible_bits);
   return VALUE2NUM(flags);
 }
 
-static VALUE spec_set_flags(struct RBasic *b, VALUE flags, VALUE visible_bits) {
+static VALUE spec_set_flags(VALUE obj, VALUE flags, VALUE visible_bits) {
   flags &= visible_bits;
-  b->flags = (b->flags & ~visible_bits) | flags;
+
+  // Could also be done like:
+  // RB_FL_UNSET(obj, visible_bits);
+  // RB_FL_SET(obj, flags);
+  // But that seems rather indirect
+  RBASIC_SET_FLAGS(obj, (RBASIC_FLAGS(obj) & ~visible_bits) | flags);
+
   return VALUE2NUM(flags);
 }
 
-VALUE rbasic_spec_get_flags(VALUE self, VALUE val) {
-  return spec_get_flags(RBASIC(val), VISIBLE_BITS);
+static VALUE rbasic_spec_get_flags(VALUE self, VALUE obj) {
+  return spec_get_flags(obj, VISIBLE_BITS);
 }
 
-VALUE rbasic_spec_set_flags(VALUE self, VALUE val, VALUE flags) {
-  return spec_set_flags(RBASIC(val), NUM2VALUE(flags), VISIBLE_BITS);
+static VALUE rbasic_spec_set_flags(VALUE self, VALUE obj, VALUE flags) {
+  return spec_set_flags(obj, NUM2VALUE(flags), VISIBLE_BITS);
 }
 
-VALUE rbasic_spec_copy_flags(VALUE self, VALUE to, VALUE from) {
-  return spec_set_flags(RBASIC(to), RBASIC(from)->flags, VISIBLE_BITS);
+static VALUE rbasic_spec_copy_flags(VALUE self, VALUE to, VALUE from) {
+  return spec_set_flags(to, RBASIC_FLAGS(from), VISIBLE_BITS);
 }
 
-VALUE rbasic_spec_get_klass(VALUE self, VALUE val) {
-  return RBASIC(val)->klass;
+static VALUE rbasic_spec_get_klass(VALUE self, VALUE obj) {
+  return RBASIC_CLASS(obj);
 }
 
-VALUE rbasic_rdata_spec_get_flags(VALUE self, VALUE structure) {
-  return spec_get_flags(&RDATA(structure)->basic, DATA_VISIBLE_BITS);
+static VALUE rbasic_rdata_spec_get_flags(VALUE self, VALUE structure) {
+  return spec_get_flags(structure, DATA_VISIBLE_BITS);
 }
 
-VALUE rbasic_rdata_spec_set_flags(VALUE self, VALUE structure, VALUE flags) {
-  return spec_set_flags(&RDATA(structure)->basic, NUM2VALUE(flags), DATA_VISIBLE_BITS);
+static VALUE rbasic_rdata_spec_set_flags(VALUE self, VALUE structure, VALUE flags) {
+  return spec_set_flags(structure, NUM2VALUE(flags), DATA_VISIBLE_BITS);
 }
 
-VALUE rbasic_rdata_spec_copy_flags(VALUE self, VALUE to, VALUE from) {
-  return spec_set_flags(&RDATA(to)->basic, RDATA(from)->basic.flags, DATA_VISIBLE_BITS);
+static VALUE rbasic_rdata_spec_copy_flags(VALUE self, VALUE to, VALUE from) {
+  return spec_set_flags(to, RBASIC_FLAGS(from), DATA_VISIBLE_BITS);
 }
 
-VALUE rbasic_rdata_spec_get_klass(VALUE self, VALUE structure) {
-  return RDATA(structure)->basic.klass;
+static VALUE rbasic_rdata_spec_get_klass(VALUE self, VALUE structure) {
+  return RBASIC_CLASS(structure);
 }
 
 void Init_rbasic_spec(void) {
diff --git a/spec/ruby/optional/capi/ext/string_spec.c b/spec/ruby/optional/capi/ext/string_spec.c
index 24a9b4e4ca..702620b9da 100644
--- a/spec/ruby/optional/capi/ext/string_spec.c
+++ b/spec/ruby/optional/capi/ext/string_spec.c
@@ -254,17 +254,11 @@ VALUE string_spec_rb_str_new5(VALUE self, VALUE str, VALUE ptr, VALUE len) {
   return rb_str_new5(str, RSTRING_PTR(ptr), FIX2INT(len));
 }
 
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__clang__) && defined(__has_warning)
-# if __has_warning("-Wdeprecated-declarations")
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wdeprecated-declarations"
-# endif
-#endif
-
 #ifndef RUBY_VERSION_IS_3_2
+// Suppress deprecations warnings for rb_tainted_str_new(), we want to test it while it exists
+RBIMPL_WARNING_PUSH()
+RBIMPL_WARNING_IGNORED(-Wdeprecated-declarations)
+
 VALUE string_spec_rb_tainted_str_new(VALUE self, VALUE str, VALUE len) {
   return rb_tainted_str_new(RSTRING_PTR(str), FIX2INT(len));
 }
@@ -272,14 +266,8 @@ VALUE string_spec_rb_tainted_str_new(VALUE self, VALUE str, VALUE len) {
 VALUE string_spec_rb_tainted_str_new2(VALUE self, VALUE str) {
   return rb_tainted_str_new2(RSTRING_PTR(str));
 }
-#endif
 
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-# pragma GCC diagnostic pop
-#elif defined(__clang__) && defined(__has_warning)
-# if __has_warning("-Wdeprecated-declarations")
-#  pragma clang diagnostic pop
-# endif
+RBIMPL_WARNING_POP()
 #endif
 
 VALUE string_spec_rb_str_plus(VALUE self, VALUE str1, VALUE str2) {
diff --git a/spec/ruby/optional/capi/ext/thread_spec.c b/spec/ruby/optional/capi/ext/thread_spec.c
index 6307e5cc99..14bd207954 100644
--- a/spec/ruby/optional/capi/ext/thread_spec.c
+++ b/spec/ruby/optional/capi/ext/thread_spec.c
@@ -26,9 +26,7 @@ static VALUE thread_spec_rb_thread_alone(VALUE self) {
   return rb_thread_alone() ? Qtrue : Qfalse;
 }
 
-#if defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+RBIMPL_WARNING_IGNORED(-Wdeprecated-declarations)
 
 /* This is unblocked by unblock_func(). */
 static void* blocking_gvl_func(void* data) {
diff --git a/spec/ruby/optional/capi/ext/typed_data_spec.c b/spec/ruby/optional/capi/ext/typed_data_spec.c
index eca2b667cc..38889ecf5c 100644
--- a/spec/ruby/optional/capi/ext/typed_data_spec.c
+++ b/spec/ruby/optional/capi/ext/typed_data_spec.c
@@ -106,6 +106,12 @@ VALUE sws_typed_wrap_struct(VALUE self, VALUE val) {
   return TypedData_Wrap_Struct(rb_cObject, &sample_typed_wrapped_struct_data_type, bar);
 }
 
+VALUE sws_untyped_wrap_struct(VALUE self, VALUE val) {
+  int* data = (int*) malloc(sizeof(int));
+  *data = FIX2INT(val);
+  return Data_Wrap_Struct(rb_cObject, NULL, free, data);
+}
+
 VALUE sws_typed_get_struct(VALUE self, VALUE obj) {
   struct sample_typed_wrapped_struct* bar;
   TypedData_Get_Struct(obj, struct sample_typed_wrapped_struct, &sample_typed_wrapped_struct_data_type, bar);
@@ -165,12 +171,17 @@ VALUE sws_typed_rb_check_typeddata_different_type(VALUE self, VALUE obj) {
   return rb_check_typeddata(obj, &sample_typed_wrapped_struct_other_data_type) == DATA_PTR(obj) ? Qtrue : Qfalse;
 }
 
+VALUE sws_typed_RTYPEDDATA_P(VALUE self, VALUE obj) {
+  return RTYPEDDATA_P(obj) ? Qtrue : Qfalse;
+}
+
 void Init_typed_data_spec(void) {
   VALUE cls = rb_define_class("CApiAllocTypedSpecs", rb_cObject);
   rb_define_alloc_func(cls, sdaf_alloc_typed_func);
   rb_define_method(cls, "typed_wrapped_data", sdaf_typed_get_struct, 0);
   cls = rb_define_class("CApiWrappedTypedStructSpecs", rb_cObject);
   rb_define_method(cls, "typed_wrap_struct", sws_typed_wrap_struct, 1);
+  rb_define_method(cls, "untyped_wrap_struct", sws_untyped_wrap_struct, 1);
   rb_define_method(cls, "typed_get_struct", sws_typed_get_struct, 1);
   rb_define_method(cls, "typed_get_struct_other", sws_typed_get_struct_different_type, 1);
   rb_define_method(cls, "typed_get_struct_parent", sws_typed_get_struct_parent_type, 1);
@@ -181,6 +192,7 @@ void Init_typed_data_spec(void) {
   rb_define_method(cls, "rb_check_typeddata_same_type", sws_typed_rb_check_typeddata_same_type, 1);
   rb_define_method(cls, "rb_check_typeddata_same_type_parent", sws_typed_rb_check_typeddata_same_type_parent, 1);
   rb_define_method(cls, "rb_check_typeddata_different_type", sws_typed_rb_check_typeddata_different_type, 1);
+  rb_define_method(cls, "RTYPEDDATA_P", sws_typed_RTYPEDDATA_P, 1);
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/rbasic_spec.rb b/spec/ruby/optional/capi/rbasic_spec.rb
index 577f2060da..f3367e05ff 100644
--- a/spec/ruby/optional/capi/rbasic_spec.rb
+++ b/spec/ruby/optional/capi/rbasic_spec.rb
@@ -33,6 +33,8 @@ describe "RBasic support for RData" do
     initial = @specs.get_flags(obj1)
     @specs.get_flags(obj2).should == initial
     @specs.set_flags(obj1, 1 << 14 | 1 << 16 | initial)
+    @specs.get_flags(obj1).should == 1 << 14 | 1 << 16 | initial
+
     @specs.copy_flags(obj2, obj1)
     @specs.get_flags(obj2).should == 1 << 14 | 1 << 16 | initial
     @specs.set_flags(obj1, initial)
diff --git a/spec/ruby/optional/capi/shared/rbasic.rb b/spec/ruby/optional/capi/shared/rbasic.rb
index 95c3137143..9d80a93e1d 100644
--- a/spec/ruby/optional/capi/shared/rbasic.rb
+++ b/spec/ruby/optional/capi/shared/rbasic.rb
@@ -1,5 +1,4 @@
 describe :rbasic, shared: true do
-
   before :all do
     specs = CApiRBasicSpecs.new
     @taint = ruby_version_is(''...'3.1') ? specs.taint_flag : 0
diff --git a/spec/ruby/optional/capi/typed_data_spec.rb b/spec/ruby/optional/capi/typed_data_spec.rb
index 23b7c157ef..6d1398a1a0 100644
--- a/spec/ruby/optional/capi/typed_data_spec.rb
+++ b/spec/ruby/optional/capi/typed_data_spec.rb
@@ -85,4 +85,16 @@ describe "CApiWrappedTypedStruct" do
       -> { @s.rb_check_typeddata_different_type(a) }.should raise_error(TypeError)
     end
   end
+
+  describe "RTYPEDDATA_P" do
+    it "returns true for a typed data" do
+      a = @s.typed_wrap_struct(1024)
+      @s.RTYPEDDATA_P(a).should == true
+    end
+
+    it "returns false for an untyped data object" do
+      a = @s.untyped_wrap_struct(1024)
+      @s.RTYPEDDATA_P(a).should == false
+    end
+  end
 end
diff --git a/spec/ruby/shared/sizedqueue/enque.rb b/spec/ruby/shared/sizedqueue/enque.rb
index 3bc8008fa4..7b6b1df730 100644
--- a/spec/ruby/shared/sizedqueue/enque.rb
+++ b/spec/ruby/shared/sizedqueue/enque.rb
@@ -120,7 +120,7 @@ describe :sizedqueue_enq, shared: true do
         q << 1
 
         t = Thread.new {
-          -> { q.send(@method, 1, timeout: 0.1) }.should raise_error(ClosedQueueError, "queue closed")
+          -> { q.send(@method, 1, timeout: 10) }.should raise_error(ClosedQueueError, "queue closed")
         }
 
         Thread.pass until q.num_waiting == 1