Update to ruby/spec@226cfdc

4 files changed, 55 insertions, 31 deletions

diff --git a/spec/ruby/core/random/default_spec.rb b/spec/ruby/core/random/default_spec.rb
index f9270ac7bb..b4ffcb81f4 100644
--- a/spec/ruby/core/random/default_spec.rb
+++ b/spec/ruby/core/random/default_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ''...'3.2' do
-  describe "Random::DEFAULT" do
+describe "Random::DEFAULT" do
+  ruby_version_is ''...'3.2' do
     it "returns a random number generator" do
       suppress_warning do
         Random::DEFAULT.should respond_to(:rand)
@@ -13,5 +13,33 @@ ruby_version_is ''...'3.2' do
       seed2 = ruby_exe('p Random::DEFAULT.seed', options: '--disable-gems')
       seed1.should != seed2
     end
+
+    ruby_version_is ''...'3.0' do
+      it "returns a Random instance" do
+        suppress_warning do
+          Random::DEFAULT.should be_an_instance_of(Random)
+        end
+      end
+    end
+
+    ruby_version_is '3.0' do
+      it "refers to the Random class" do
+        suppress_warning do
+          Random::DEFAULT.should.equal?(Random)
+        end
+      end
+
+      it "is deprecated" do
+        -> {
+          Random::DEFAULT.should.equal?(Random)
+        }.should complain(/constant Random::DEFAULT is deprecated/)
+      end
+    end
+  end
+
+  ruby_version_is '3.2' do
+    it "is no longer defined" do
+      Random.should_not.const_defined?(:DEFAULT)
+    end
   end
 end
diff --git a/spec/ruby/core/random/raw_seed_spec.rb b/spec/ruby/core/random/raw_seed_spec.rb
deleted file mode 100644
index 0e40ed0796..0000000000
--- a/spec/ruby/core/random/raw_seed_spec.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'shared/urandom'
-
-describe "Random.urandom" do
-  it_behaves_like :random_urandom, :urandom
-end
diff --git a/spec/ruby/core/random/shared/urandom.rb b/spec/ruby/core/random/shared/urandom.rb
deleted file mode 100644
index 159716075c..0000000000
--- a/spec/ruby/core/random/shared/urandom.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-describe :random_urandom, shared: true do
-  it "returns a String" do
-    Random.send(@method, 1).should be_an_instance_of(String)
-  end
-
-  it "returns a String of the length given as argument" do
-    Random.send(@method, 15).length.should == 15
-  end
-
-  it "raises an ArgumentError on a negative size" do
-    -> {
-      Random.send(@method, -1)
-    }.should raise_error(ArgumentError)
-  end
-
-  it "returns a binary String" do
-    Random.send(@method, 15).encoding.should == Encoding::BINARY
-  end
-
-  it "returns a random binary String" do
-    Random.send(@method, 12).should_not == Random.send(@method, 12)
-  end
-end
diff --git a/spec/ruby/core/random/urandom_spec.rb b/spec/ruby/core/random/urandom_spec.rb
new file mode 100644
index 0000000000..6f180e54ac
--- /dev/null
+++ b/spec/ruby/core/random/urandom_spec.rb
@@ -0,0 +1,25 @@
+require_relative '../../spec_helper'
+
+describe "Random.urandom" do
+  it "returns a String" do
+    Random.urandom(1).should be_an_instance_of(String)
+  end
+
+  it "returns a String of the length given as argument" do
+    Random.urandom(15).length.should == 15
+  end
+
+  it "raises an ArgumentError on a negative size" do
+    -> {
+      Random.urandom(-1)
+    }.should raise_error(ArgumentError)
+  end
+
+  it "returns a binary String" do
+    Random.urandom(15).encoding.should == Encoding::BINARY
+  end
+
+  it "returns a random binary String" do
+    Random.urandom(12).should_not == Random.urandom(12)
+  end
+end