From 21b162a6241fca17b07da72417d5809863cd29c9 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 22 Oct 2012 03:24:01 +0000 Subject: [PATCH] Merged r10689 from trunk to 2.1-stable Partial backout r10263. Backout replacing shoulda context of test/unit/helpers/issues_helper_test.rb. Test methods in shoulda context do not run on Ruby 1.8.7-p370. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10691 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/helpers/issues_helper_test.rb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/test/unit/helpers/issues_helper_test.rb b/test/unit/helpers/issues_helper_test.rb index 8ad655429..d39573e73 100644 --- a/test/unit/helpers/issues_helper_test.rb +++ b/test/unit/helpers/issues_helper_test.rb @@ -135,27 +135,29 @@ class IssuesHelperTest < ActionView::TestCase end end - def test_with_a_due_date_attribute_should_with_a_due_date_attribute - @detail = JournalDetail.new( + 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' ) - with_settings :date_format => '%m/%d/%Y' do - assert_match "01/31/2010", show_detail(@detail, true) + with_settings :date_format => '%m/%d/%Y' do + assert_match "01/31/2010", show_detail(@detail, true) + end end - end - def test_with_a_due_date_attribute_should_format_the_old_date - @detail = JournalDetail.new( + should "format the old date" do + @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) + with_settings :date_format => '%m/%d/%Y' do + assert_match "01/01/2010", show_detail(@detail, true) + end end end