4 files changed, 166 insertions, 117 deletions
diff --git a/spec/ruby/core/range/shared/cover.rb b/spec/ruby/core/range/shared/cover.rb
index 5b09cea4e0..189f3da4bf 100644
--- a/spec/ruby/core/range/shared/cover.rb
+++ b/spec/ruby/core/range/shared/cover.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 
@@ -6,26 +6,26 @@ describe :range_cover, shared: true do
   it "uses the range element's <=> to make the comparison" do
     a = mock('a')
     a.should_receive(:<=>).twice.and_return(-1,-1)
-    (a..'z').send(@method, 'b').should be_true
+    (a..'z').send(@method, 'b').should == true
   end
 
   it "uses a continuous inclusion test" do
-    ('a'..'f').send(@method, 'aa').should be_true
-    ('a'..'f').send(@method, 'babe').should be_true
-    ('a'..'f').send(@method, 'baby').should be_true
-    ('a'..'f').send(@method, 'ga').should be_false
-    (-10..-2).send(@method, -2.5).should be_true
+    ('a'..'f').send(@method, 'aa').should == true
+    ('a'..'f').send(@method, 'babe').should == true
+    ('a'..'f').send(@method, 'baby').should == true
+    ('a'..'f').send(@method, 'ga').should == false
+    (-10..-2).send(@method, -2.5).should == true
   end
 
   describe "on string elements" do
     it "returns true if other is matched by element.succ" do
-      ('a'..'c').send(@method, 'b').should be_true
-      ('a'...'c').send(@method, 'b').should be_true
+      ('a'..'c').send(@method, 'b').should == true
+      ('a'...'c').send(@method, 'b').should == true
     end
 
     it "returns true if other is not matched by element.succ" do
-      ('a'..'c').send(@method, 'bc').should be_true
-      ('a'...'c').send(@method, 'bc').should be_true
+      ('a'..'c').send(@method, 'bc').should == true
+      ('a'...'c').send(@method, 'bc').should == true
     end
   end
 
@@ -36,27 +36,27 @@ describe :range_cover, shared: true do
       end
 
       it "returns false if other is less than first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should == false
       end
 
       it "returns true if other is equal as first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should == true
       end
 
       it "returns true if other is matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should == true
       end
 
       it "returns true if other is not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should == true
       end
 
       it "returns true if other is equal as last element but not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should == true
       end
 
       it "returns false if other is greater than last element but matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should == false
       end
     end
 
@@ -66,90 +66,128 @@ describe :range_cover, shared: true do
       end
 
       it "returns false if other is less than first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should == false
       end
 
       it "returns true if other is equal as first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should == true
       end
 
       it "returns true if other is matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should == true
       end
 
       it "returns true if other is not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should == true
       end
 
       it "returns false if other is equal as last element but not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should == false
       end
 
       it "returns false if other is greater than last element but matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should == false
       end
     end
   end
 end
 
 describe :range_cover_subrange, shared: true do
-  ruby_version_is "2.6" do
-    context "range argument" do
-      it "accepts range argument" do
-        (0..10).send(@method, (3..7)).should be_true
-        (0..10).send(@method, (3..15)).should be_false
-        (0..10).send(@method, (-2..7)).should be_false
-
-        (1.1..7.9).send(@method, (2.5..6.5)).should be_true
-        (1.1..7.9).send(@method, (2.5..8.5)).should be_false
-        (1.1..7.9).send(@method, (0.5..6.5)).should be_false
-
-        ('c'..'i').send(@method, ('d'..'f')).should be_true
-        ('c'..'i').send(@method, ('d'..'z')).should be_false
-        ('c'..'i').send(@method, ('a'..'f')).should be_false
-
-        range_10_100 = RangeSpecs::TenfoldSucc.new(10)..RangeSpecs::TenfoldSucc.new(100)
-        range_20_90 = RangeSpecs::TenfoldSucc.new(20)..RangeSpecs::TenfoldSucc.new(90)
-        range_20_110 = RangeSpecs::TenfoldSucc.new(20)..RangeSpecs::TenfoldSucc.new(110)
-        range_0_90 = RangeSpecs::TenfoldSucc.new(0)..RangeSpecs::TenfoldSucc.new(90)
-
-        range_10_100.send(@method, range_20_90).should be_true
-        range_10_100.send(@method, range_20_110).should be_false
-        range_10_100.send(@method, range_0_90).should be_false
-      end
+  context "range argument" do
+    it "accepts range argument" do
+      (0..10).send(@method, (3..7)).should == true
+      (0..10).send(@method, (3..15)).should == false
+      (0..10).send(@method, (-2..7)).should == false
+
+      (1.1..7.9).send(@method, (2.5..6.5)).should == true
+      (1.1..7.9).send(@method, (2.5..8.5)).should == false
+      (1.1..7.9).send(@method, (0.5..6.5)).should == false
+
+      ('c'..'i').send(@method, ('d'..'f')).should == true
+      ('c'..'i').send(@method, ('d'..'z')).should == false
+      ('c'..'i').send(@method, ('a'..'f')).should == false
+
+      range_10_100 = RangeSpecs::TenfoldSucc.new(10)..RangeSpecs::TenfoldSucc.new(100)
+      range_20_90 = RangeSpecs::TenfoldSucc.new(20)..RangeSpecs::TenfoldSucc.new(90)
+      range_20_110 = RangeSpecs::TenfoldSucc.new(20)..RangeSpecs::TenfoldSucc.new(110)
+      range_0_90 = RangeSpecs::TenfoldSucc.new(0)..RangeSpecs::TenfoldSucc.new(90)
+
+      range_10_100.send(@method, range_20_90).should == true
+      range_10_100.send(@method, range_20_110).should == false
+      range_10_100.send(@method, range_0_90).should == false
+    end
 
-      it "supports boundaries of different comparable types" do
-        (0..10).send(@method, (3.1..7.9)).should be_true
-        (0..10).send(@method, (3.1..15.9)).should be_false
-        (0..10).send(@method, (-2.1..7.9)).should be_false
-      end
+    it "supports boundaries of different comparable types" do
+      (0..10).send(@method, (3.1..7.9)).should == true
+      (0..10).send(@method, (3.1..15.9)).should == false
+      (0..10).send(@method, (-2.1..7.9)).should == false
+    end
 
-      it "returns false if types are not comparable" do
-        (0..10).send(@method, ('a'..'z')).should be_false
-        (0..10).send(@method, (RangeSpecs::TenfoldSucc.new(0)..RangeSpecs::TenfoldSucc.new(100))).should be_false
-      end
+    it "returns false if types are not comparable" do
+      (0..10).send(@method, ('a'..'z')).should == false
+      (0..10).send(@method, (RangeSpecs::TenfoldSucc.new(0)..RangeSpecs::TenfoldSucc.new(100))).should == false
+    end
 
-      it "honors exclusion of right boundary (:exclude_end option)" do
-        # Integer
-        (0..10).send(@method, (0..10)).should be_true
-        (0...10).send(@method, (0...10)).should be_true
+    it "honors exclusion of right boundary (:exclude_end option)" do
+      # Integer
+      (0..10).send(@method, (0..10)).should == true
+      (0...10).send(@method, (0...10)).should == true
 
-        (0..10).send(@method, (0...10)).should be_true
-        (0...10).send(@method, (0..10)).should be_false
+      (0..10).send(@method, (0...10)).should == true
+      (0...10).send(@method, (0..10)).should == false
 
-        (0...11).send(@method, (0..10)).should be_true
-        (0..10).send(@method, (0...11)).should be_true
+      (0...11).send(@method, (0..10)).should == true
+      (0..10).send(@method, (0...11)).should == true
 
-        # Float
-        (0..10.1).send(@method, (0..10.1)).should be_true
-        (0...10.1).send(@method, (0...10.1)).should be_true
+      # Float
+      (0..10.1).send(@method, (0..10.1)).should == true
+      (0...10.1).send(@method, (0...10.1)).should == true
 
-        (0..10.1).send(@method, (0...10.1)).should be_true
-        (0...10.1).send(@method, (0..10.1)).should be_false
+      (0..10.1).send(@method, (0...10.1)).should == true
+      (0...10.1).send(@method, (0..10.1)).should == false
 
-        (0...11.1).send(@method, (0..10.1)).should be_true
-        (0..10.1).send(@method, (0...11.1)).should be_false
-      end
+      (0...11.1).send(@method, (0..10.1)).should == true
+      (0..10.1).send(@method, (0...11.1)).should == false
     end
   end
+
+  it "allows self to be a beginless range" do
+    (...10).send(@method, (3..7)).should == true
+    (...10).send(@method, (3..15)).should == false
+
+    (..7.9).send(@method, (2.5..6.5)).should == true
+    (..7.9).send(@method, (2.5..8.5)).should == false
+
+    (..'i').send(@method, ('d'..'f')).should == true
+    (..'i').send(@method, ('d'..'z')).should == false
+  end
+
+  it "allows self to be a endless range" do
+    eval("(0...)").send(@method, (3..7)).should == true
+    eval("(5...)").send(@method, (3..15)).should == false
+
+    eval("(1.1..)").send(@method, (2.5..6.5)).should == true
+    eval("(3.3..)").send(@method, (2.5..8.5)).should == false
+
+    eval("('a'..)").send(@method, ('d'..'f')).should == true
+    eval("('p'..)").send(@method, ('d'..'z')).should == false
+  end
+
+  it "accepts beginless range argument" do
+    (..10).send(@method, (...10)).should == true
+    (0..10).send(@method, (...10)).should == false
+
+    (1.1..7.9).send(@method, (...10.5)).should == false
+
+    ('c'..'i').send(@method, (..'i')).should == false
+  end
+
+  it "accepts endless range argument" do
+    eval("(0..)").send(@method, eval("(0...)")).should == true
+    (0..10).send(@method, eval("(0...)")).should == false
+
+    (1.1..7.9).send(@method, eval("(0.8...)")).should == false
+
+    ('c'..'i').send(@method, eval("('a'..)")).should == false
+  end
 end
diff --git a/spec/ruby/core/range/shared/cover_and_include.rb b/spec/ruby/core/range/shared/cover_and_include.rb
index b308524310..97721a7307 100644
--- a/spec/ruby/core/range/shared/cover_and_include.rb
+++ b/spec/ruby/core/range/shared/cover_and_include.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 
 describe :range_cover_and_include, shared: true do
@@ -19,11 +19,25 @@ describe :range_cover_and_include, shared: true do
     (0.5...2.4).send(@method, 2.4).should == false
   end
 
-  ruby_version_is "2.6" do
-    it "returns true if other is an element of self for endless ranges" do
-      eval("(1..)").send(@method, 2.4).should == true
-      eval("(0.5...)").send(@method, 2.4).should == true
-    end
+  it "returns true if other is an element of self for endless ranges" do
+    (1..).send(@method, 2.4).should == true
+    (0.5...).send(@method, 2.4).should == true
+  end
+
+  it "returns true if other is an element of self for beginless ranges" do
+    (..10).send(@method, 2.4).should == true
+    (...10.5).send(@method, 2.4).should == true
+  end
+
+  it "returns false if values are not comparable" do
+    (1..10).send(@method, nil).should == false
+    (1...10).send(@method, nil).should == false
+
+    (..10).send(@method, nil).should == false
+    (...10).send(@method, nil).should == false
+
+    (1..).send(@method, nil).should == false
+    (1...).send(@method, nil).should == false
   end
 
   it "compares values using <=>" do
@@ -32,42 +46,41 @@ describe :range_cover_and_include, shared: true do
     m.should_receive(:coerce).and_return([1, 2])
     m.should_receive(:<=>).and_return(1)
 
-    rng.send(@method, m).should be_false
+    rng.send(@method, m).should == false
   end
 
   it "raises an ArgumentError without exactly one argument" do
-    ->{ (1..2).send(@method) }.should raise_error(ArgumentError)
-    ->{ (1..2).send(@method, 1, 2) }.should raise_error(ArgumentError)
+    ->{ (1..2).send(@method) }.should.raise(ArgumentError)
+    ->{ (1..2).send(@method, 1, 2) }.should.raise(ArgumentError)
   end
 
   it "returns true if argument is equal to the first value of the range" do
-    (0..5).send(@method, 0).should be_true
-    ('f'..'s').send(@method, 'f').should be_true
+    (0..5).send(@method, 0).should == true
+    ('f'..'s').send(@method, 'f').should == true
   end
 
   it "returns true if argument is equal to the last value of the range" do
-    (0..5).send(@method, 5).should be_true
-    (0...5).send(@method, 4).should be_true
-    ('f'..'s').send(@method, 's').should be_true
+    (0..5).send(@method, 5).should == true
+    (0...5).send(@method, 4).should == true
+    ('f'..'s').send(@method, 's').should == true
   end
 
   it "returns true if argument is less than the last value of the range and greater than the first value" do
-    (20..30).send(@method, 28).should be_true
-    ('e'..'h').send(@method, 'g').should be_true
-    ("\u{999}".."\u{9999}").send @method, "\u{9995}"
+    (20..30).send(@method, 28).should == true
+    ('e'..'h').send(@method, 'g').should == true
   end
 
   it "returns true if argument is sole element in the range" do
-    (30..30).send(@method, 30).should be_true
+    (30..30).send(@method, 30).should == true
   end
 
   it "returns false if range is empty" do
-    (30...30).send(@method, 30).should be_false
-    (30...30).send(@method, nil).should be_false
+    (30...30).send(@method, 30).should == false
+    (30...30).send(@method, nil).should == false
   end
 
   it "returns false if the range does not contain the argument" do
-    ('A'..'C').send(@method, 20.9).should be_false
-    ('A'...'C').send(@method, 'C').should be_false
+    ('A'..'C').send(@method, 20.9).should == false
+    ('A'...'C').send(@method, 'C').should == false
   end
 end
diff --git a/spec/ruby/core/range/shared/equal_value.rb b/spec/ruby/core/range/shared/equal_value.rb
index 8872b4efc0..363c6be558 100644
--- a/spec/ruby/core/range/shared/equal_value.rb
+++ b/spec/ruby/core/range/shared/equal_value.rb
@@ -43,11 +43,9 @@ describe :range_eql, shared: true do
     a.send(@method, b).should == true
   end
 
-  ruby_version_is "2.6" do
-    it "works for endless Ranges" do
-      eval("(1..)").send(@method, eval("(1..)")).should == true
-      eval("(0.5...)").send(@method, eval("(0.5...)")).should == true
-      eval("(1..)").send(@method, eval("(1...)")).should == false
-    end
+  it "works for endless Ranges" do
+    eval("(1..)").send(@method, eval("(1..)")).should == true
+    eval("(0.5...)").send(@method, eval("(0.5...)")).should == true
+    eval("(1..)").send(@method, eval("(1...)")).should == false
   end
 end
diff --git a/spec/ruby/core/range/shared/include.rb b/spec/ruby/core/range/shared/include.rb
index c6c5c2becf..5f0db48008 100644
--- a/spec/ruby/core/range/shared/include.rb
+++ b/spec/ruby/core/range/shared/include.rb
@@ -1,17 +1,17 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 
 describe :range_include, shared: true do
   describe "on string elements" do
     it "returns true if other is matched by element.succ" do
-      ('a'..'c').send(@method, 'b').should be_true
-      ('a'...'c').send(@method, 'b').should be_true
+      ('a'..'c').send(@method, 'b').should == true
+      ('a'...'c').send(@method, 'b').should == true
     end
 
     it "returns false if other is not matched by element.succ" do
-      ('a'..'c').send(@method, 'bc').should be_false
-      ('a'...'c').send(@method, 'bc').should be_false
+      ('a'..'c').send(@method, 'bc').should == false
+      ('a'...'c').send(@method, 'bc').should == false
     end
   end
 
@@ -22,27 +22,27 @@ describe :range_include, shared: true do
       end
 
       it "returns false if other is less than first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should == false
       end
 
       it "returns true if other is equal as first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should == true
       end
 
       it "returns true if other is matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should == true
       end
 
       it "returns false if other is not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should == false
       end
 
       it "returns false if other is equal as last element but not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should == false
       end
 
       it "returns false if other is greater than last element but matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should == false
       end
     end
 
@@ -52,27 +52,27 @@ describe :range_include, shared: true do
       end
 
       it "returns false if other is less than first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(0)).should == false
       end
 
       it "returns true if other is equal as first element" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(1)).should == true
       end
 
       it "returns true if other is matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should be_true
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(10)).should == true
       end
 
       it "returns false if other is not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(2)).should == false
       end
 
       it "returns false if other is equal as last element but not matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(99)).should == false
       end
 
       it "returns false if other is greater than last element but matched by element.succ" do
-        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should be_false
+        @range.send(@method, RangeSpecs::TenfoldSucc.new(100)).should == false
       end
     end
   end