9 files changed, 95 insertions, 100 deletions

diff --git a/spec/ruby/library/datetime/hour_spec.rb b/spec/ruby/library/datetime/hour_spec.rb
index 383a85fe60..5d8e75edcb 100644
--- a/spec/ruby/library/datetime/hour_spec.rb
+++ b/spec/ruby/library/datetime/hour_spec.rb
@@ -35,8 +35,7 @@ describe "DateTime#hour" do
   end
 
   it "raises an error for hour fractions smaller than -24" do
-    -> { new_datetime(hour: -24 - Rational(1,2)) }.should(
-      raise_error(ArgumentError))
+    -> { new_datetime(hour: -24 - Rational(1,2)) }.should.raise(ArgumentError)
   end
 
   it "adds 1 to day, when 24 hours given" do
diff --git a/spec/ruby/library/datetime/iso8601_spec.rb b/spec/ruby/library/datetime/iso8601_spec.rb
index 457881277a..4368300fd5 100644
--- a/spec/ruby/library/datetime/iso8601_spec.rb
+++ b/spec/ruby/library/datetime/iso8601_spec.rb
@@ -6,5 +6,7 @@ describe "DateTime.iso8601" do
 end
 
 describe "DateTime#iso8601" do
-  it "needs to be reviewed for spec completeness"
+  it "is an alias of DateTime#isoxmlschema8601" do
+    DateTime.instance_method(:iso8601).should == DateTime.instance_method(:xmlschema)
+  end
 end
diff --git a/spec/ruby/library/datetime/min_spec.rb b/spec/ruby/library/datetime/min_spec.rb
index a1eaa214cb..ca995a7eed 100644
--- a/spec/ruby/library/datetime/min_spec.rb
+++ b/spec/ruby/library/datetime/min_spec.rb
@@ -1,6 +1,8 @@
 require_relative '../../spec_helper'
-require_relative 'shared/min'
+require 'date'
 
-describe "DateTime.min" do
-  it_behaves_like :datetime_min, :min
+describe "DateTime#min" do
+  it "is an alias of DateTime#minute" do
+    DateTime.instance_method(:min).should == DateTime.instance_method(:minute)
+  end
 end
diff --git a/spec/ruby/library/datetime/minute_spec.rb b/spec/ruby/library/datetime/minute_spec.rb
index acdfeda345..6e99752de7 100644
--- a/spec/ruby/library/datetime/minute_spec.rb
+++ b/spec/ruby/library/datetime/minute_spec.rb
@@ -1,6 +1,40 @@
 require_relative '../../spec_helper'
-require_relative 'shared/min'
+require 'date'
 
-describe "DateTime.minute" do
-  it_behaves_like :datetime_min, :minute
+describe "DateTime#minute" do
+  it "returns 0 if no argument is passed" do
+    DateTime.new.minute.should == 0
+  end
+
+  it "returns the minute passed as argument" do
+    new_datetime(minute: 5).minute.should == 5
+  end
+
+  it "adds 60 to negative minutes" do
+    new_datetime(minute: -20).minute.should == 40
+  end
+
+  it "raises an error for Rational" do
+    -> { new_datetime minute: 5 + Rational(1,2) }.should.raise(ArgumentError)
+  end
+
+  it "raises an error for Float" do
+    -> { new_datetime minute: 5.5 }.should.raise(ArgumentError)
+  end
+
+  it "raises an error for Rational" do
+    -> { new_datetime(hour: 2 + Rational(1,2)) }.should.raise(ArgumentError)
+  end
+
+  it "raises an error, when the minute is smaller than -60" do
+    -> { new_datetime(minute: -61) }.should.raise(ArgumentError)
+  end
+
+  it "raises an error, when the minute is greater or equal than 60" do
+    -> { new_datetime(minute: 60) }.should.raise(ArgumentError)
+  end
+
+  it "raises an error for minute fractions smaller than -60" do
+    -> { new_datetime(minute: -60 - Rational(1,2))}.should.raise(ArgumentError)
+  end
 end
diff --git a/spec/ruby/library/datetime/sec_spec.rb b/spec/ruby/library/datetime/sec_spec.rb
index f681283c8e..f8a8b4646e 100644
--- a/spec/ruby/library/datetime/sec_spec.rb
+++ b/spec/ruby/library/datetime/sec_spec.rb
@@ -1,6 +1,8 @@
 require_relative '../../spec_helper'
-require_relative 'shared/sec'
+require 'date'
 
-describe "DateTime.sec" do
-  it_behaves_like :datetime_sec, :sec
+describe "DateTime#sec" do
+  it "is an alias of DateTime#second" do
+    DateTime.instance_method(:sec).should == DateTime.instance_method(:second)
+  end
 end
diff --git a/spec/ruby/library/datetime/second_fraction_spec.rb b/spec/ruby/library/datetime/second_fraction_spec.rb
index d5393149ba..70f5abf560 100644
--- a/spec/ruby/library/datetime/second_fraction_spec.rb
+++ b/spec/ruby/library/datetime/second_fraction_spec.rb
@@ -2,5 +2,7 @@ require_relative '../../spec_helper'
 require 'date'
 
 describe "DateTime#second_fraction" do
-  it "needs to be reviewed for spec completeness"
+  it "is an alias of DateTime#sec_fraction" do
+    DateTime.instance_method(:second_fraction).should == DateTime.instance_method(:sec_fraction)
+  end
 end
diff --git a/spec/ruby/library/datetime/second_spec.rb b/spec/ruby/library/datetime/second_spec.rb
index 545c3f9109..9fb1965b73 100644
--- a/spec/ruby/library/datetime/second_spec.rb
+++ b/spec/ruby/library/datetime/second_spec.rb
@@ -1,6 +1,45 @@
 require_relative '../../spec_helper'
-require_relative 'shared/sec'
+require 'date'
 
 describe "DateTime#second" do
-  it_behaves_like :datetime_sec, :second
+  it "returns 0 seconds if passed no arguments" do
+    d = DateTime.new
+    d.second.should == 0
+  end
+
+  it "returns the seconds passed in the arguments" do
+    new_datetime(second: 5).second.should == 5
+  end
+
+  it "adds 60 to negative values" do
+    new_datetime(second: -20).second.should == 40
+  end
+
+  it "returns the absolute value of a Rational" do
+    new_datetime(second: 5 + Rational(1,2)).second.should == 5
+  end
+
+  it "returns the absolute value of a float" do
+    new_datetime(second: 5.5).second.should == 5
+  end
+
+  it "raises an error when minute is given as a rational" do
+    -> { new_datetime(minute: 5 + Rational(1,2)) }.should.raise(ArgumentError)
+  end
+
+  it "raises an error, when the second is smaller than -60" do
+    -> { new_datetime(second: -61) }.should.raise(ArgumentError)
+  end
+
+  it "raises an error, when the second is greater or equal than 60" do
+    -> { new_datetime(second: 60) }.should.raise(ArgumentError)
+  end
+
+  it "raises an error for second fractions smaller than -60" do
+    -> { new_datetime(second: -60 - Rational(1,2))}.should.raise(ArgumentError)
+  end
+
+  it "takes a second fraction near 60" do
+    new_datetime(second: 59 + Rational(1,2)).second.should == 59
+  end
 end
diff --git a/spec/ruby/library/datetime/shared/min.rb b/spec/ruby/library/datetime/shared/min.rb
deleted file mode 100644
index 04e5f3457a..0000000000
--- a/spec/ruby/library/datetime/shared/min.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'date'
-
-describe :datetime_min, shared: true do
-  it "returns 0 if no argument is passed" do
-    DateTime.new.send(@method).should == 0
-  end
-
-  it "returns the minute passed as argument" do
-    new_datetime(minute: 5).send(@method).should == 5
-  end
-
-  it "adds 60 to negative minutes" do
-    new_datetime(minute: -20).send(@method).should == 40
-  end
-
-  it "raises an error for Rational" do
-    -> { new_datetime minute: 5 + Rational(1,2) }.should.raise(ArgumentError)
-  end
-
-  it "raises an error for Float" do
-    -> { new_datetime minute: 5.5 }.should.raise(ArgumentError)
-  end
-
-  it "raises an error for Rational" do
-    -> { new_datetime(hour: 2 + Rational(1,2)) }.should.raise(ArgumentError)
-  end
-
-  it "raises an error, when the minute is smaller than -60" do
-    -> { new_datetime(minute: -61) }.should.raise(ArgumentError)
-  end
-
-  it "raises an error, when the minute is greater or equal than 60" do
-    -> { new_datetime(minute: 60) }.should.raise(ArgumentError)
-  end
-
-  it "raises an error for minute fractions smaller than -60" do
-    -> { new_datetime(minute: -60 - Rational(1,2))}.should(
-      raise_error(ArgumentError))
-  end
-end
diff --git a/spec/ruby/library/datetime/shared/sec.rb b/spec/ruby/library/datetime/shared/sec.rb
deleted file mode 100644
index 5af5db4fb2..0000000000
--- a/spec/ruby/library/datetime/shared/sec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'date'
-
-describe :datetime_sec, shared: true do
-  it "returns 0 seconds if passed no arguments" do
-    d = DateTime.new
-    d.send(@method).should == 0
-  end
-
-  it "returns the seconds passed in the arguments" do
-    new_datetime(second: 5).send(@method).should == 5
-  end
-
-  it "adds 60 to negative values" do
-    new_datetime(second: -20).send(@method).should == 40
-  end
-
-  it "returns the absolute value of a Rational" do
-    new_datetime(second: 5 + Rational(1,2)).send(@method).should == 5
-  end
-
-  it "returns the absolute value of a float" do
-    new_datetime(second: 5.5).send(@method).should == 5
-  end
-
-  it "raises an error when minute is given as a rational" do
-    -> { new_datetime(minute: 5 + Rational(1,2)) }.should.raise(ArgumentError)
-  end
-
-  it "raises an error, when the second is smaller than -60" do
-    -> { new_datetime(second: -61) }.should.raise(ArgumentError)
-  end
-
-  it "raises an error, when the second is greater or equal than 60" do
-    -> { new_datetime(second: 60) }.should.raise(ArgumentError)
-  end
-
-  it "raises an error for second fractions smaller than -60" do
-    -> { new_datetime(second: -60 - Rational(1,2))}.should(
-      raise_error(ArgumentError))
-  end
-
-  it "takes a second fraction near 60" do
-    new_datetime(second: 59 + Rational(1,2)).send(@method).should == 59
-  end
-end