Update to ruby/spec@35a9fba

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

6 files changed, 188 insertions, 4 deletions

diff --git a/spec/ruby/core/kernel/Complex_spec.rb b/spec/ruby/core/kernel/Complex_spec.rb
index 44e4f44ada..e5435a56e6 100644
--- a/spec/ruby/core/kernel/Complex_spec.rb
+++ b/spec/ruby/core/kernel/Complex_spec.rb
@@ -138,4 +138,52 @@ describe "Kernel.Complex()" do
       lambda { Complex(nil, 0) }.should raise_error(TypeError, "can't convert nil into Complex")
     end
   end
+
+  ruby_version_is "2.6" do
+    describe "when passed exception: false" do
+      describe "and [Numeric]" do
+        it "returns a complex number" do
+          Complex("123", exception: false).should == Complex(123)
+        end
+      end
+
+      describe "and [non-Numeric]" do
+        it "swallows an error" do
+          Complex(:sym, exception: false).should == nil
+        end
+      end
+
+      describe "and [non-Numeric, Numeric] argument" do
+        it "throws a TypeError" do
+          lambda { Complex(:sym, 0, exception: false) }.should raise_error(TypeError, "not a real")
+        end
+      end
+
+      describe "and [anything, non-Numeric] argument" do
+        it "swallows an error" do
+          Complex("a",  :sym, exception: false).should == nil
+          Complex(:sym, :sym, exception: false).should == nil
+          Complex(0,    :sym, exception: false).should == nil
+        end
+      end
+
+      describe "and non-numeric String arguments" do
+        it "swallows an error" do
+          Complex("a", "b", exception: false).should == nil
+          Complex("a", 0, exception: false).should == nil
+          Complex(0, "b", exception: false).should == nil
+        end
+      end
+
+      ruby_bug "#15525", "2.6"..."2.6.1" do
+        describe "and nil arguments" do
+          it "swallows an error" do
+            Complex(nil, exception: false).should == nil
+            Complex(0, nil, exception: false).should == nil
+            Complex(nil, 0, exception: false).should == nil
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/kernel/Float_spec.rb b/spec/ruby/core/kernel/Float_spec.rb
index 47d7d0816f..43daefa6aa 100644
--- a/spec/ruby/core/kernel/Float_spec.rb
+++ b/spec/ruby/core/kernel/Float_spec.rb
@@ -299,6 +299,31 @@ describe :kernel_float, shared: true do
     c = Complex(2, 3)
     lambda { @object.send(:Float, c) }.should raise_error(RangeError)
   end
+
+  ruby_version_is "2.6" do
+    describe "when passed exception: false" do
+      describe "and valid input" do
+        it "returns a Float number" do
+          @object.send(:Float, 1, exception: false).should == 1.0
+          @object.send(:Float, "1", exception: false).should == 1.0
+          @object.send(:Float, "1.23", exception: false).should == 1.23
+        end
+      end
+
+      describe "and invalid input" do
+        it "swallows an error" do
+          @object.send(:Float, "abc", exception: false).should == nil
+          @object.send(:Float, :sym, exception: false).should == nil
+        end
+      end
+
+      describe "and nil" do
+        it "swallows it" do
+          @object.send(:Float, nil, exception: false).should == nil
+        end
+      end
+    end
+  end
 end
 
 describe "Kernel.Float" do
diff --git a/spec/ruby/core/kernel/Integer_spec.rb b/spec/ruby/core/kernel/Integer_spec.rb
index b79c827d31..72e33fc737 100644
--- a/spec/ruby/core/kernel/Integer_spec.rb
+++ b/spec/ruby/core/kernel/Integer_spec.rb
@@ -99,6 +99,65 @@ describe :kernel_integer, shared: true do
   it "raises a FloatDomainError when passed Infinity" do
     lambda { Integer(infinity_value) }.should raise_error(FloatDomainError)
   end
+
+  ruby_version_is "2.6" do
+    describe "when passed exception: false" do
+      describe "and to_i returns a value that is not an Integer" do
+        it "swallows an error" do
+          obj = mock("object")
+          obj.should_receive(:to_i).and_return("1")
+          Integer(obj, exception: false).should == nil
+        end
+      end
+
+      describe "and no to_int or to_i methods exist" do
+        it "swallows an error" do
+          obj = mock("object")
+          Integer(obj, exception: false).should == nil
+        end
+      end
+
+      describe "and to_int returns nil and no to_i exists" do
+        it "swallows an error" do
+          obj = mock("object")
+          obj.should_receive(:to_i).and_return(nil)
+          Integer(obj, exception: false).should == nil
+        end
+      end
+
+      ruby_bug "#15525", "2.6"..."2.6.1" do
+        describe "and passed NaN" do
+          it "swallows an error" do
+            Integer(nan_value, exception: false).should == nil
+          end
+        end
+
+        describe "and passed Infinity" do
+          it "swallows an error" do
+            Integer(infinity_value, exception: false).should == nil
+          end
+        end
+      end
+
+      describe "and passed nil" do
+        it "swallows an error" do
+          Integer(nil, exception: false).should == nil
+        end
+      end
+
+      describe "and passed a String that contains numbers" do
+        it "normally parses it and returns an Integer" do
+          Integer("42", exception: false).should == 42
+        end
+      end
+
+      describe "and passed a String that can't be converted to an Integer" do
+        it "swallows an error" do
+          Integer("abc", exception: false).should == nil
+        end
+      end
+    end
+  end
 end
 
 describe "Integer() given a String", shared: true do
@@ -189,6 +248,34 @@ describe "Integer() given a String", shared: true do
     lambda { Integer("") }.should raise_error(ArgumentError)
   end
 
+  ruby_version_is "2.6" do
+    describe "when passed exception: false" do
+      describe "and multiple leading -s" do
+        it "swallows an error" do
+          Integer("---1", exception: false).should == nil
+        end
+      end
+
+      describe "and multiple trailing -s" do
+        it "swallows an error" do
+          Integer("1---", exception: false).should == nil
+        end
+      end
+
+      describe "and an argument that contains a period" do
+        it "swallows an error" do
+          Integer("0.0", exception: false).should == nil
+        end
+      end
+
+      describe "and an empty string" do
+        it "swallows an error" do
+          Integer("", exception: false).should == nil
+        end
+      end
+    end
+  end
+
   it "parses the value as 0 if the string consists of a single zero character" do
     Integer("0").should == 0
   end
@@ -508,6 +595,24 @@ describe "Integer() given a String and base", shared: true do
       lambda { Integer(98, 15) }.should raise_error(ArgumentError)
     end
   end
+
+  ruby_version_is "2.6" do
+    describe "when passed exception: false" do
+      describe "and valid argument" do
+        it "returns an Integer number" do
+          Integer("100", 10, exception: false).should == 100
+          Integer("100", 2, exception: false).should == 4
+        end
+      end
+
+      describe "and invalid argument" do
+        it "swallows an error" do
+          Integer("999", 2, exception: false).should == nil
+          Integer("abc", 10, exception: false).should == nil
+        end
+      end
+    end
+  end
 end
 
 describe :kernel_Integer, shared: true do
diff --git a/spec/ruby/core/kernel/match_spec.rb b/spec/ruby/core/kernel/match_spec.rb
index d5808b6ede..6dc1eb7de8 100644
--- a/spec/ruby/core/kernel/match_spec.rb
+++ b/spec/ruby/core/kernel/match_spec.rb
@@ -13,4 +13,12 @@ describe "Kernel#=~" do
       (o =~ true).should       be_nil
     end
   end
+
+  ruby_version_is "2.6" do
+    it "is deprecated" do
+      -> do
+        Object.new =~ /regexp/
+      end.should complain(/deprecated Object#=~ is called on Object/, verbose: true)
+    end
+  end
 end
diff --git a/spec/ruby/core/kernel/shared/load.rb b/spec/ruby/core/kernel/shared/load.rb
index 0ce7d58d2c..b479b29399 100644
--- a/spec/ruby/core/kernel/shared/load.rb
+++ b/spec/ruby/core/kernel/shared/load.rb
@@ -30,9 +30,8 @@ describe :kernel_load, shared: true do
   it "loads a file that recursively requires itself" do
     path = File.expand_path "recursive_require_fixture.rb", CODE_LOADING_DIR
     -> {
-      $VERBOSE = true
       @object.load(path).should be_true
-    }.should complain(/circular require considered harmful/)
+    }.should complain(/circular require considered harmful/, verbose: true)
     ScratchPad.recorded.should == [:loaded, :loaded]
   end
 
diff --git a/spec/ruby/core/kernel/shared/require.rb b/spec/ruby/core/kernel/shared/require.rb
index a81a68088a..b502476bc3 100644
--- a/spec/ruby/core/kernel/shared/require.rb
+++ b/spec/ruby/core/kernel/shared/require.rb
@@ -225,9 +225,8 @@ describe :kernel_require, shared: true do
     it "loads a file that recursively requires itself" do
       path = File.expand_path "recursive_require_fixture.rb", CODE_LOADING_DIR
       -> {
-        $VERBOSE = true
         @object.require(path).should be_true
-      }.should complain(/circular require considered harmful/)
+      }.should complain(/circular require considered harmful/, verbose: true)
       ScratchPad.recorded.should == [:loaded]
     end
   end