From 90c44e490e5b9a08f7041449f945a6199bd6d7cd Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 1 Sep 2012 07:24:21 +0000
Subject: [PATCH] Merged r10253, r10257, r10263 and r10264 from trunk to
 2.0-stable

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@10267 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/helpers/issues_helper_test.rb | 44 +++++++++++++++++++------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/test/unit/helpers/issues_helper_test.rb b/test/unit/helpers/issues_helper_test.rb
index ab81f5a52..3eeb1d7cf 100644
--- a/test/unit/helpers/issues_helper_test.rb
+++ b/test/unit/helpers/issues_helper_test.rb
@@ -108,26 +108,50 @@ class IssuesHelperTest < ActionView::TestCase
       end
     end
 
-    context "with a start_date attribute" do
-      should "format the current date" do
-        @detail = JournalDetail.new(:property => 'attr', :old_value => '2010-01-01', :value => '2010-01-31', :prop_key => 'start_date')
+    def test_with_a_start_date_attribute_should_format_the_current_date
+      @detail = JournalDetail.new(
+                   :property  => 'attr',
+                   :old_value => '2010-01-01',
+                   :value     => '2010-01-31',
+                   :prop_key  => 'start_date'
+                )
+      with_settings :date_format => '%m/%d/%Y' do
         assert_match "01/31/2010", show_detail(@detail, true)
       end
+    end
 
-      should "format the old date" do
-        @detail = JournalDetail.new(:property => 'attr', :old_value => '2010-01-01', :value => '2010-01-31', :prop_key => 'start_date')
+    def test_with_a_start_date_attribute_should_format_the_old_date
+      @detail = JournalDetail.new(
+                   :property  => 'attr',
+                   :old_value => '2010-01-01',
+                   :value     => '2010-01-31',
+                   :prop_key  => 'start_date'
+                )
+      with_settings :date_format => '%m/%d/%Y' do
         assert_match "01/01/2010", show_detail(@detail, true)
       end
     end
 
-    context "with a due_date attribute" do
-      should "format the current date" do
-        @detail = JournalDetail.new(:property => 'attr', :old_value => '2010-01-01', :value => '2010-01-31', :prop_key => 'due_date')
+    def test_with_a_due_date_attribute_should_with_a_due_date_attribute
+      @detail = JournalDetail.new(
+                  :property  => 'attr',
+                  :old_value => '2010-01-01',
+                  :value     => '2010-01-31',
+                  :prop_key  => 'due_date'
+                )
+      with_settings :date_format => '%m/%d/%Y' do
         assert_match "01/31/2010", show_detail(@detail, true)
       end
+    end
 
-      should "format the old date" do
-        @detail = JournalDetail.new(:property => 'attr', :old_value => '2010-01-01', :value => '2010-01-31', :prop_key => 'due_date')
+    def test_with_a_due_date_attribute_should_format_the_old_date
+      @detail = JournalDetail.new(
+                  :property  => 'attr',
+                  :old_value => '2010-01-01',
+                  :value     => '2010-01-31',
+                  :prop_key  => 'due_date'
+                )
+      with_settings :date_format => '%m/%d/%Y' do
         assert_match "01/01/2010", show_detail(@detail, true)
       end
     end