Compare commits

..
2 Commits
Author SHA1 Message Date
Toshi MARUYAMA 5cefd924a2 Merged r10689 from trunk to 2.0-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.0-stable@10695 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-22 03:34:29 +00:00
Toshi MARUYAMA 1d888f25f6 Merged r10688 from trunk to 2.0-stable
Backout r10253.

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.0-stable@10694 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-22 03:34:02 +00:00
+8 -4
View File
@@ -108,7 +108,8 @@ class IssuesHelperTest < ActionView::TestCase
end end
end end
def test_with_a_start_date_attribute_should_format_the_current_date context "with a start_date attribute" do
should "format the current date" do
@detail = JournalDetail.new( @detail = JournalDetail.new(
:property => 'attr', :property => 'attr',
:old_value => '2010-01-01', :old_value => '2010-01-01',
@@ -120,7 +121,7 @@ class IssuesHelperTest < ActionView::TestCase
end end
end end
def test_with_a_start_date_attribute_should_format_the_old_date should "format the old date" do
@detail = JournalDetail.new( @detail = JournalDetail.new(
:property => 'attr', :property => 'attr',
:old_value => '2010-01-01', :old_value => '2010-01-01',
@@ -131,8 +132,10 @@ class IssuesHelperTest < ActionView::TestCase
assert_match "01/01/2010", show_detail(@detail, true) assert_match "01/01/2010", show_detail(@detail, true)
end end
end end
end
def test_with_a_due_date_attribute_should_with_a_due_date_attribute context "with a due_date attribute" do
should "format the current date" do
@detail = JournalDetail.new( @detail = JournalDetail.new(
:property => 'attr', :property => 'attr',
:old_value => '2010-01-01', :old_value => '2010-01-01',
@@ -144,7 +147,7 @@ class IssuesHelperTest < ActionView::TestCase
end end
end end
def test_with_a_due_date_attribute_should_format_the_old_date should "format the old date" do
@detail = JournalDetail.new( @detail = JournalDetail.new(
:property => 'attr', :property => 'attr',
:old_value => '2010-01-01', :old_value => '2010-01-01',
@@ -155,6 +158,7 @@ class IssuesHelperTest < ActionView::TestCase
assert_match "01/01/2010", show_detail(@detail, true) assert_match "01/01/2010", show_detail(@detail, true)
end end
end end
end
should "show old and new values with a project attribute" do should "show old and new values with a project attribute" do
detail = JournalDetail.new(:property => 'attr', :prop_key => 'project_id', :old_value => 1, :value => 2) detail = JournalDetail.new(:property => 'attr', :prop_key => 'project_id', :old_value => 1, :value => 2)