5 files changed, 81 insertions, 68 deletions

diff --git a/spec/ruby/library/securerandom/base64_spec.rb b/spec/ruby/library/securerandom/base64_spec.rb
index 57db25fa29..49d4b8a029 100644
--- a/spec/ruby/library/securerandom/base64_spec.rb
+++ b/spec/ruby/library/securerandom/base64_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 require 'securerandom'
 
@@ -6,13 +6,13 @@ describe "SecureRandom.base64" do
   it "generates a random base64 string out of specified number of random bytes" do
     (16..128).each do |idx|
       base64 = SecureRandom.base64(idx)
-      base64.should be_kind_of(String)
+      base64.should.is_a?(String)
       base64.length.should < 2 * idx
       base64.should =~ /^[A-Za-z0-9\+\/]+={0,2}$/
     end
 
     base64 = SecureRandom.base64(16.5)
-    base64.should be_kind_of(String)
+    base64.should.is_a?(String)
     base64.length.should < 2 * 16
   end
 
@@ -32,19 +32,19 @@ describe "SecureRandom.base64" do
   end
 
   it "generates a random base64 string out of 32 random bytes" do
-    SecureRandom.base64.should be_kind_of(String)
+    SecureRandom.base64.should.is_a?(String)
     SecureRandom.base64.length.should < 32 * 2
   end
 
   it "treats nil argument as default one and generates a random base64 string" do
-    SecureRandom.base64(nil).should be_kind_of(String)
+    SecureRandom.base64(nil).should.is_a?(String)
     SecureRandom.base64(nil).length.should < 32 * 2
   end
 
   it "raises ArgumentError on negative arguments" do
-    lambda {
+    -> {
       SecureRandom.base64(-1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "tries to convert the passed argument to an Integer using #to_int" do
diff --git a/spec/ruby/library/securerandom/bytes_spec.rb b/spec/ruby/library/securerandom/bytes_spec.rb
new file mode 100644
index 0000000000..a1ab836d16
--- /dev/null
+++ b/spec/ruby/library/securerandom/bytes_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative '../../core/random/shared/bytes'
+
+require 'securerandom'
+
+describe "SecureRandom.bytes" do
+  it_behaves_like :random_bytes, :bytes, SecureRandom
+end
diff --git a/spec/ruby/library/securerandom/hex_spec.rb b/spec/ruby/library/securerandom/hex_spec.rb
index 8690d8458c..ec33aca1ee 100644
--- a/spec/ruby/library/securerandom/hex_spec.rb
+++ b/spec/ruby/library/securerandom/hex_spec.rb
@@ -1,18 +1,18 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 require 'securerandom'
 
 describe "SecureRandom.hex" do
-  it "generates a random hex string of length twice the specified argement" do
+  it "generates a random hex string of length twice the specified argument" do
     (1..64).each do |idx|
       hex = SecureRandom.hex(idx)
-      hex.should be_kind_of(String)
+      hex.should.is_a?(String)
       hex.length.should == 2 * idx
     end
 
     base64 = SecureRandom.hex(5.5)
-    base64.should be_kind_of(String)
-    base64.length.should eql(10)
+    base64.should.is_a?(String)
+    base64.length.should.eql?(10)
   end
 
   it "returns an empty string when argument is 0" do
@@ -31,24 +31,24 @@ describe "SecureRandom.hex" do
   end
 
   it "generates a random hex string of length 32 if no argument is provided" do
-    SecureRandom.hex.should be_kind_of(String)
+    SecureRandom.hex.should.is_a?(String)
     SecureRandom.hex.length.should == 32
   end
 
   it "treats nil argument as default one and generates a random hex string of length 32" do
-    SecureRandom.hex(nil).should be_kind_of(String)
+    SecureRandom.hex(nil).should.is_a?(String)
     SecureRandom.hex(nil).length.should == 32
   end
 
   it "raises ArgumentError on negative arguments" do
-    lambda {
+    -> {
       SecureRandom.hex(-1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "tries to convert the passed argument to an Integer using #to_int" do
     obj = mock("to_int")
     obj.should_receive(:to_int).and_return(5)
-    SecureRandom.hex(obj).size.should eql(10)
+    SecureRandom.hex(obj).size.should.eql?(10)
   end
 end
diff --git a/spec/ruby/library/securerandom/random_bytes_spec.rb b/spec/ruby/library/securerandom/random_bytes_spec.rb
index 37d82f55a6..4e30a53163 100644
--- a/spec/ruby/library/securerandom/random_bytes_spec.rb
+++ b/spec/ruby/library/securerandom/random_bytes_spec.rb
@@ -1,28 +1,31 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../core/random/shared/bytes'
 
 require 'securerandom'
 
 describe "SecureRandom.random_bytes" do
+  it_behaves_like :random_bytes, :random_bytes, SecureRandom
+
   it "generates a random binary string of length 16 if no argument is provided" do
     bytes = SecureRandom.random_bytes
-    bytes.should be_kind_of(String)
+    bytes.should.is_a?(String)
     bytes.length.should == 16
   end
 
   it "generates a random binary string of length 16 if argument is nil" do
     bytes = SecureRandom.random_bytes(nil)
-    bytes.should be_kind_of(String)
+    bytes.should.is_a?(String)
     bytes.length.should == 16
   end
 
   it "generates a random binary string of specified length" do
     (1..64).each do |idx|
       bytes = SecureRandom.random_bytes(idx)
-      bytes.should be_kind_of(String)
+      bytes.should.is_a?(String)
       bytes.length.should == idx
     end
 
-    SecureRandom.random_bytes(2.2).length.should eql(2)
+    SecureRandom.random_bytes(2.2).length.should.eql?(2)
   end
 
   it "generates different binary strings with subsequent invocations" do
@@ -37,14 +40,14 @@ describe "SecureRandom.random_bytes" do
   end
 
   it "raises ArgumentError on negative arguments" do
-    lambda {
+    -> {
       SecureRandom.random_bytes(-1)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "tries to convert the passed argument to an Integer using #to_int" do
     obj = mock("to_int")
     obj.should_receive(:to_int).and_return(5)
-    SecureRandom.random_bytes(obj).size.should eql(5)
+    SecureRandom.random_bytes(obj).size.should.eql?(5)
   end
 end
diff --git a/spec/ruby/library/securerandom/random_number_spec.rb b/spec/ruby/library/securerandom/random_number_spec.rb
index a23a457df2..97cd66f7bc 100644
--- a/spec/ruby/library/securerandom/random_number_spec.rb
+++ b/spec/ruby/library/securerandom/random_number_spec.rb
@@ -1,14 +1,18 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../core/random/shared/rand'
 
 require 'securerandom'
 
 describe "SecureRandom.random_number" do
+  it_behaves_like :random_number, :rand, SecureRandom
+  it_behaves_like :random_number, :random_number, SecureRandom
+
   it "generates a random positive number smaller then the positive integer argument" do
     (1..64).each do |idx|
       num = SecureRandom.random_number(idx)
-      num.should be_kind_of(Fixnum)
-      (0 <= num).should == true
-      (num < idx).should == true
+      num.should.is_a?(Integer)
+      0.should <= num
+      num.should < idx
     end
   end
 
@@ -16,64 +20,62 @@ describe "SecureRandom.random_number" do
     max = 12345678901234567890
     11.times do
       num = SecureRandom.random_number max
-      num.should be_kind_of(Integer)
-      (0 <= num).should == true
-      (num < max).should == true
+      num.should.is_a?(Integer)
+      0.should <= num
+      num.should < max
     end
   end
 
   it "generates a random float number between 0.0 and 1.0 if no argument provided" do
     64.times do
       num = SecureRandom.random_number
-      num.should be_kind_of(Float)
-      (0.0 <= num).should == true
-      (num < 1.0).should == true
+      num.should.is_a?(Float)
+      0.0.should <= num
+      num.should < 1.0
     end
   end
 
-  ruby_version_is "2.3" do
-    it "generates a random value in given (integer) range limits" do
-      64.times do
-        num = SecureRandom.random_number 11...13
-        num.should be_kind_of(Integer)
-        (11 <= num).should == true
-        (num < 13).should == true
-      end
+  it "generates a random value in given (integer) range limits" do
+    64.times do
+      num = SecureRandom.random_number 11...13
+      num.should.is_a?(Integer)
+      11.should <= num
+      num.should < 13
     end
+  end
 
-    it "generates a random value in given big (integer) range limits" do
-      lower = 12345678901234567890
-      upper = 12345678901234567890 + 5
-      32.times do
-        num = SecureRandom.random_number lower..upper
-        num.should be_kind_of(Integer)
-        (lower <= num).should == true
-        (num <= upper).should == true
-      end
+  it "generates a random value in given big (integer) range limits" do
+    lower = 12345678901234567890
+    upper = 12345678901234567890 + 5
+    32.times do
+      num = SecureRandom.random_number lower..upper
+      num.should.is_a?(Integer)
+      lower.should <= num
+      num.should <= upper
     end
+  end
 
-    it "generates a random value in given (float) range limits" do
-      64.times do
-        num = SecureRandom.random_number 0.6..0.9
-        num.should be_kind_of(Float)
-        (0.6 <= num).should == true
-        (num <= 0.9).should == true
-      end
+  it "generates a random value in given (float) range limits" do
+    64.times do
+      num = SecureRandom.random_number 0.6..0.9
+      num.should.is_a?(Float)
+      0.6.should <= num
+      num.should <= 0.9
     end
   end
 
   it "generates a random float number between 0.0 and 1.0 if argument is negative" do
     num = SecureRandom.random_number(-10)
-    num.should be_kind_of(Float)
-    (0.0 <= num).should == true
-    (num < 1.0).should == true
+    num.should.is_a?(Float)
+    0.0.should <= num
+    num.should < 1.0
   end
 
   it "generates a random float number between 0.0 and 1.0 if argument is negative float" do
     num = SecureRandom.random_number(-11.1)
-    num.should be_kind_of(Float)
-    (0.0 <= num).should == true
-    (num < 1.0).should == true
+    num.should.is_a?(Float)
+    0.0.should <= num
+    num.should < 1.0
   end
 
   it "generates different float numbers with subsequent invocations" do
@@ -82,14 +84,14 @@ describe "SecureRandom.random_number" do
     256.times do
       val = SecureRandom.random_number
       # make sure the random values are not repeating
-      values.include?(val).should == false
+      values.should_not.include?(val)
       values << val
     end
   end
 
   it "raises ArgumentError if the argument is non-numeric" do
-    lambda {
+    -> {
       SecureRandom.random_number(Object.new)
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 end