1 files changed, 17 insertions, 19 deletions
diff --git a/spec/ruby/core/time/plus_spec.rb b/spec/ruby/core/time/plus_spec.rb
index 0a9984f180..6bd01bcdf3 100644
--- a/spec/ruby/core/time/plus_spec.rb
+++ b/spec/ruby/core/time/plus_spec.rb
@@ -17,9 +17,9 @@ describe "Time#+" do
   end
 
   it "raises a TypeError if given argument is a coercible String" do
-    -> { Time.now + "1" }.should raise_error(TypeError)
-    -> { Time.now + "0.1" }.should raise_error(TypeError)
-    -> { Time.now + "1/3" }.should raise_error(TypeError)
+    -> { Time.now + "1" }.should.raise(TypeError)
+    -> { Time.now + "0.1" }.should.raise(TypeError)
+    -> { Time.now + "1/3" }.should.raise(TypeError)
   end
 
   it "increments the time by the specified amount as rational numbers" do
@@ -32,16 +32,16 @@ describe "Time#+" do
   end
 
   it "raises TypeError on argument that can't be coerced into Rational" do
-    -> { Time.now + Object.new }.should raise_error(TypeError)
-    -> { Time.now + "stuff" }.should raise_error(TypeError)
+    -> { Time.now + Object.new }.should.raise(TypeError)
+    -> { Time.now + "stuff" }.should.raise(TypeError)
   end
 
   it "returns a UTC time if self is UTC" do
-    (Time.utc(2012) + 10).utc?.should == true
+    (Time.utc(2012) + 10).should.utc?
   end
 
   it "returns a non-UTC time if self is non-UTC" do
-    (Time.local(2012) + 10).utc?.should == false
+    (Time.local(2012) + 10).should_not.utc?
   end
 
   it "returns a time with the same fixed offset as self" do
@@ -50,35 +50,33 @@ describe "Time#+" do
 
   it "preserves time zone" do
     time_with_zone = Time.now.utc
-    time_with_zone.zone.should == (time_with_zone + 60*60).zone
+    time_with_zone.zone.should == (time_with_zone + 1).zone
 
     time_with_zone = Time.now
-    time_with_zone.zone.should == (time_with_zone + 60*60).zone
+    time_with_zone.zone.should == (time_with_zone + 1).zone
   end
 
-  ruby_version_is "2.6" do
-    context "zone is a timezone object" do
-      it "preserves time zone" do
-        zone = TimeSpecs::Timezone.new(offset: (5*3600+30*60))
-        time = Time.new(2012, 1, 1, 12, 0, 0, zone) + 60*60
+  context "zone is a timezone object" do
+    it "preserves time zone" do
+      zone = TimeSpecs::Timezone.new(offset: (5*3600+30*60))
+      time = Time.new(2012, 1, 1, 12, 0, 0, zone) + 1
 
-        time.zone.should == zone
-      end
+      time.zone.should == zone
     end
   end
 
   it "does not return a subclass instance" do
     c = Class.new(Time)
     x = c.now + 1
-    x.should be_an_instance_of(Time)
+    x.should.instance_of?(Time)
   end
 
   it "raises TypeError on Time argument" do
-    -> { Time.now + Time.now }.should raise_error(TypeError)
+    -> { Time.now + Time.now }.should.raise(TypeError)
   end
 
   it "raises TypeError on nil argument" do
-    -> { Time.now + nil }.should raise_error(TypeError)
+    -> { Time.now + nil }.should.raise(TypeError)
   end
 
   #see [ruby-dev:38446]