1 files changed, 19 insertions, 7 deletions
diff --git a/spec/ruby/library/date/iso8601_spec.rb b/spec/ruby/library/date/iso8601_spec.rb
index 2c698db514..af66845a6b 100644
--- a/spec/ruby/library/date/iso8601_spec.rb
+++ b/spec/ruby/library/date/iso8601_spec.rb
@@ -17,18 +17,21 @@ describe "Date.iso8601" do
     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
-    -> { Date.iso8601(:test) }.should raise_error(ArgumentError)
+  it "raises a Date::Error if the argument is a invalid Date" do
+    -> {
+      Date.iso8601('invalid')
+    }.should raise_error(Date::Error, "invalid date")
+  end
+
+  it "raises a Date::Error when passed a nil" do
+    -> {
+      Date.iso8601(nil)
+    }.should raise_error(Date::Error, "invalid date")
   end
 
   it "raises a TypeError when passed an Object" do
@@ -41,4 +44,13 @@ describe "Date._iso8601" do
     h = Date._iso8601('invalid')
     h.should == {}
   end
+
+  it "returns an empty hash if the argument is nil" do
+    h = Date._iso8601(nil)
+    h.should == {}
+  end
+
+  it "raises a TypeError when passed an Object" do
+    -> { Date._iso8601(Object.new) }.should raise_error(TypeError)
+  end
 end