Merge remote-tracking branch 'origin/release/0.18'0.18

1 files changed, 38 insertions, 2 deletions

diff --git a/spec/helpers/link_to_helper_spec.rb b/spec/helpers/link_to_helper_spec.rb
index 2259db6c2..4a01ec683 100644
--- a/spec/helpers/link_to_helper_spec.rb
+++ b/spec/helpers/link_to_helper_spec.rb
@@ -70,14 +70,50 @@ describe LinkToHelper do
     end
 
     describe 'simple_date' do
+
+        it 'formats a date in html by default' do
+            time = Time.utc(2012, 11, 07, 21, 30, 26)
+            self.should_receive(:simple_date_html).with(time)
+            simple_date(time)
+        end
+
+        it 'formats a date in the specified format' do
+            time = Time.utc(2012, 11, 07, 21, 30, 26)
+            self.should_receive(:simple_date_text).with(time)
+            simple_date(time, :format => :text)
+        end
+
+        it 'raises an argument error if given an unrecognized format' do
+            time = Time.utc(2012, 11, 07, 21, 30, 26)
+            expect { simple_date(time, :format => :unknown) }.to raise_error(ArgumentError)
+        end
+
+    end
+
+    describe 'simple_date_html' do
+
+        it 'formats a date in a time tag' do
+            Time.use_zone('London') do
+                time = Time.utc(2012, 11, 07, 21, 30, 26)
+                expected = "<time datetime=\"2012-11-07T21:30:26+00:00\" title=\"2012-11-07 21:30:26 +0000\">November 07, 2012</time>"
+                simple_date_html(time).should == expected
+            end
+        end
+
+    end
+
+    describe 'simple_date_text' do
+
         it 'should respect time zones' do
             Time.use_zone('Australia/Sydney') do
-                simple_date(Time.utc(2012, 11, 07, 21, 30, 26)).should == 'November 08, 2012'
+                simple_date_text(Time.utc(2012, 11, 07, 21, 30, 26)).should == 'November 08, 2012'
             end
         end
 
         it 'should handle Date objects' do
-            simple_date(Date.new(2012, 11, 21)).should == 'November 21, 2012'
+            simple_date_text(Date.new(2012, 11, 21)).should == 'November 21, 2012'
         end
+
     end
+
 end