1 files changed, 46 insertions, 2 deletions
diff --git a/spec/ruby/core/integer/plus_spec.rb b/spec/ruby/core/integer/plus_spec.rb
index c292943d06..5d1169c7da 100644
--- a/spec/ruby/core/integer/plus_spec.rb
+++ b/spec/ruby/core/integer/plus_spec.rb
@@ -1,6 +1,50 @@
 require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../shared/arithmetic_exception_in_coerce', __FILE__)
+require File.expand_path('../shared/arithmetic_coerce', __FILE__)
 
 describe "Integer#+" do
-  it_behaves_like :integer_arithmetic_exception_in_coerce, :+
+  ruby_version_is "2.4"..."2.5" do
+    it_behaves_like :integer_arithmetic_coerce_rescue, :+
+  end
+
+  ruby_version_is "2.5" do
+    it_behaves_like :integer_arithmetic_coerce_not_rescue, :+
+  end
+
+  context "fixnum" do
+    it "returns self plus the given Integer" do
+      (491 + 2).should == 493
+      (90210 + 10).should == 90220
+
+      (9 + bignum_value).should == 9223372036854775817
+      (1001 + 5.219).should == 1006.219
+    end
+
+    it "raises a TypeError when given a non-Integer" do
+      lambda {
+        (obj = mock('10')).should_receive(:to_int).any_number_of_times.and_return(10)
+        13 + obj
+      }.should raise_error(TypeError)
+      lambda { 13 + "10"    }.should raise_error(TypeError)
+      lambda { 13 + :symbol }.should raise_error(TypeError)
+    end
+  end
+
+  context "bignum" do
+    before :each do
+      @bignum = bignum_value(76)
+    end
+
+    it "returns self plus the given Integer" do
+      (@bignum + 4).should == 9223372036854775888
+      (@bignum + 4.2).should be_close(9223372036854775888.2, TOLERANCE)
+      (@bignum + bignum_value(3)).should == 18446744073709551695
+    end
+
+    it "raises a TypeError when given a non-Integer" do
+      lambda { @bignum + mock('10') }.should raise_error(TypeError)
+      lambda { @bignum + "10" }.should raise_error(TypeError)
+      lambda { @bignum + :symbol}.should raise_error(TypeError)
+    end
+  end
 end
+