7 files changed, 45 insertions, 47 deletions
diff --git a/spec/ruby/core/random/bytes_spec.rb b/spec/ruby/core/random/bytes_spec.rb
index 06e84d03bd..b42dc61234 100644
--- a/spec/ruby/core/random/bytes_spec.rb
+++ b/spec/ruby/core/random/bytes_spec.rb
@@ -9,7 +9,6 @@ describe "Random#bytes" do
     Random.new(33).bytes(2).should == Random.new(33).bytes(2)
   end
 
-  # Should double check this is official spec
   it "returns the same numeric output for a given seed across all implementations and platforms" do
     rnd = Random.new(33)
     rnd.bytes(2).should == "\x14\\"
@@ -18,7 +17,7 @@ describe "Random#bytes" do
   end
 
   it "returns the same numeric output for a given huge seed across all implementations and platforms" do
-    rnd = Random.new(bignum_value ** 4)
+    rnd = Random.new(2 ** (63 * 4))
     rnd.bytes(2).should == "_\x91"
     rnd.bytes(1000) # skip some
     rnd.bytes(2).should == "\x17\x12"
diff --git a/spec/ruby/core/random/default_spec.rb b/spec/ruby/core/random/default_spec.rb
index a709eddd53..01d7430df8 100644
--- a/spec/ruby/core/random/default_spec.rb
+++ b/spec/ruby/core/random/default_spec.rb
@@ -1,22 +1,19 @@
 require_relative '../../spec_helper'
 
 describe "Random::DEFAULT" do
-
-  it "returns a random number generator" do
-    suppress_warning do
-      Random::DEFAULT.should respond_to(:rand)
-    end
-  end
-
-  ruby_version_is ''...'3.0' do
-    it "returns a Random instance" do
+  ruby_version_is ''...'3.2' do
+    it "returns a random number generator" do
       suppress_warning do
-        Random::DEFAULT.should be_an_instance_of(Random)
+        Random::DEFAULT.should respond_to(:rand)
       end
     end
-  end
 
-  ruby_version_is '3.0' do
+    it "changes seed on reboot" do
+      seed1 = ruby_exe('p Random::DEFAULT.seed', options: '--disable-gems')
+      seed2 = ruby_exe('p Random::DEFAULT.seed', options: '--disable-gems')
+      seed1.should != seed2
+    end
+
     it "refers to the Random class" do
       suppress_warning do
         Random::DEFAULT.should.equal?(Random)
@@ -30,9 +27,9 @@ describe "Random::DEFAULT" do
     end
   end
 
-  it "changes seed on reboot" do
-    seed1 = ruby_exe('p Random::DEFAULT.seed', options: '--disable-gems')
-    seed2 = ruby_exe('p Random::DEFAULT.seed', options: '--disable-gems')
-    seed1.should != seed2
+  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/new_spec.rb b/spec/ruby/core/random/new_spec.rb
index 4280b5b9c3..90e2a9d6f2 100644
--- a/spec/ruby/core/random/new_spec.rb
+++ b/spec/ruby/core/random/new_spec.rb
@@ -1,3 +1,4 @@
+require_relative "../../spec_helper"
 describe "Random.new" do
   it "returns a new instance of Random" do
     Random.new.should be_an_instance_of(Random)
diff --git a/spec/ruby/core/random/rand_spec.rb b/spec/ruby/core/random/rand_spec.rb
index 6ea7eece5f..9244177ab5 100644
--- a/spec/ruby/core/random/rand_spec.rb
+++ b/spec/ruby/core/random/rand_spec.rb
@@ -205,6 +205,11 @@ describe "Random#rand with Range" do
     Random.new(42).rand(0..1.0).should be_kind_of(Float)
   end
 
+  it "returns a float within a given float range" do
+    Random.new(42).rand(0.0...100.0).should == 37.454011884736246
+    Random.new(42).rand(-100.0...0.0).should == -62.545988115263754
+  end
+
   it "raises an ArgumentError when the startpoint lacks #+ and #- methods" do
     -> do
       Random.new.rand(Object.new..67)
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