aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-06-03 11:59:54 +0100
committerGareth Rees <gareth@mysociety.org>2014-06-05 10:56:04 +0100
commitd5b1587b378c73354b1677fb17e96f39c76f2ec3 (patch)
treef2c75c9fbf09d1fe415ac55fd3e7aba31fa8500c
parentce262c7c4291533468f57fb209131828d7e08462 (diff)
Minor tidying of DateTimeHelper and specs
-rw-r--r--app/helpers/date_time_helper.rb8
-rw-r--r--spec/helpers/date_time_helper_spec.rb8
2 files changed, 8 insertions, 8 deletions
diff --git a/app/helpers/date_time_helper.rb b/app/helpers/date_time_helper.rb
index 5fcec5a87..f8d4b3611 100644
--- a/app/helpers/date_time_helper.rb
+++ b/app/helpers/date_time_helper.rb
@@ -24,7 +24,7 @@ module DateTimeHelper
if respond_to?(date_formatter)
send(date_formatter, date)
else
- raise ArgumentError, "Unrecognised format :#{ opts[:format] }"
+ raise ArgumentError, "Unrecognized format :#{ opts[:format] }"
end
end
@@ -35,7 +35,7 @@ module DateTimeHelper
#
# Returns a String
def simple_date_html(date)
- date = date.in_time_zone unless date.is_a? Date
+ date = date.in_time_zone unless date.is_a?(Date)
time_tag date, simple_date_text(date), :title => date.to_s
end
@@ -48,8 +48,8 @@ module DateTimeHelper
def simple_date_text(date)
date = date.in_time_zone.to_date unless date.is_a? Date
- date_format = _("simple_date_format")
- date_format = :long if date_format == "simple_date_format"
+ date_format = _('simple_date_format')
+ date_format = :long if date_format == 'simple_date_format'
I18n.l(date, :format => date_format)
end
diff --git a/spec/helpers/date_time_helper_spec.rb b/spec/helpers/date_time_helper_spec.rb
index 6b55a11d1..870deb2d0 100644
--- a/spec/helpers/date_time_helper_spec.rb
+++ b/spec/helpers/date_time_helper_spec.rb
@@ -4,7 +4,7 @@ describe DateTimeHelper do
include DateTimeHelper
- describe 'simple_date' do
+ describe :simple_date do
it 'formats a date in html by default' do
time = Time.utc(2012, 11, 07, 21, 30, 26)
@@ -25,19 +25,19 @@ describe DateTimeHelper do
end
- describe 'simple_date_html' do
+ 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>"
+ expected = %Q(<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
+ describe :simple_date_text do
it 'should respect time zones' do
Time.use_zone('Australia/Sydney') do