2 files changed, 25 insertions, 0 deletions
diff --git a/spec/ruby/core/string/to_f_spec.rb b/spec/ruby/core/string/to_f_spec.rb
index a91ccc168e..abfd2517b6 100644
--- a/spec/ruby/core/string/to_f_spec.rb
+++ b/spec/ruby/core/string/to_f_spec.rb
@@ -127,4 +127,16 @@ describe "String#to_f" do
       }.should raise_error(Encoding::CompatibilityError, "ASCII incompatible encoding: UTF-16")
     end
   end
+
+  it "allows String representation without a fractional part" do
+    "1.".to_f.should == 1.0
+    "+1.".to_f.should == 1.0
+    "-1.".to_f.should == -1.0
+    "1.e+0".to_f.should == 1.0
+    "1.e+0".to_f.should == 1.0
+
+    ruby_bug "#20705", ""..."3.4" do
+      "1.e-2".to_f.should be_close(0.01, TOLERANCE)
+    end
+  end
 end
diff --git a/spec/ruby/core/string/unpack1_spec.rb b/spec/ruby/core/string/unpack1_spec.rb
index 3b3b879f75..cfb47fe695 100644
--- a/spec/ruby/core/string/unpack1_spec.rb
+++ b/spec/ruby/core/string/unpack1_spec.rb
@@ -31,4 +31,17 @@ describe "String#unpack1" do
   it "raises an ArgumentError when the offset is larger than the string bytesize" do
     -> { "a".unpack1("C", offset: 2) }.should raise_error(ArgumentError, "offset outside of string")
   end
+
+  context "with format 'm0'" do
+    # unpack1("m0") takes a special code path that calls Pack.unpackBase46Strict instead of Pack.unpack_m,
+    # which is why we repeat the tests for unpack("m0") here.
+
+    it "decodes base64" do
+      "dGVzdA==".unpack1("m0").should == "test"
+    end
+
+    it "raises an ArgumentError for an invalid base64 character" do
+      -> { "dGV%zdA==".unpack1("m0") }.should raise_error(ArgumentError)
+    end
+  end
 end