2 files changed, 42 insertions, 0 deletions
diff --git a/spec/ruby/library/date/iso8601_spec.rb b/spec/ruby/library/date/iso8601_spec.rb
new file mode 100644
index 0000000000..41f055e648
--- /dev/null
+++ b/spec/ruby/library/date/iso8601_spec.rb
@@ -0,0 +1,37 @@
+require_relative '../../spec_helper'
+require 'date'
+
+describe "Date.iso8601" do
+  it "parses YYYY-MM-DD into a Date object" do
+    d = Date.iso8601("2018-01-01")
+    d.should == Date.civil(2018, 1, 1)
+  end
+
+  it "parses YYYYMMDD into a Date object" do
+    d = Date.iso8601("20180715")
+    d.should == Date.civil(2018, 7, 15)
+  end
+
+  it "parses a negative Date" do
+    d = Date.iso8601("-4712-01-01")
+    d.should == Date.civil(-4712, 1, 1)
+  end
+
+  it "parses a Symbol into a Date object" do
+    d = Date.iso8601(:'2015-10-15')
+    d.should == Date.civil(2015, 10, 15)
+  end
+
+  it "parses a StringSubclass into a Date object" do
+    d = Date.iso8601(Class.new(String).new("-4712-01-01"))
+    d.should == Date.civil(-4712, 1, 1)
+  end
+
+  it "raises an ArgumentError when passed a Symbol without a valid Date" do
+    lambda { Date.iso8601(:test) }.should raise_error(ArgumentError)
+  end
+
+  it "raises a TypeError when passed an Object" do
+    lambda { Date.iso8601(Object.new) }.should raise_error(TypeError)
+  end
+end
diff --git a/spec/ruby/library/date/parse_spec.rb b/spec/ruby/library/date/parse_spec.rb
index 0c21e9aeba..09e072ba3e 100644
--- a/spec/ruby/library/date/parse_spec.rb
+++ b/spec/ruby/library/date/parse_spec.rb
@@ -64,6 +64,11 @@ describe "Date#parse" do
     d = Date.parse("19101101")
     d.should == Date.civil(1910, 11, 1)
   end
+
+  it "raises a TypeError trying to parse non-String-like object" do
+    lambda { Date.parse(1) }.should raise_error(TypeError)
+    lambda { Date.parse(:invalid) }.should raise_error(TypeError)
+  end
 end
 
 describe "Date#parse with '.' separator" do