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
This commit is contained in:
parent
b7e999d1aa
commit
21b162a624
|
@ -135,27 +135,29 @@ class IssuesHelperTest < ActionView::TestCase
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_with_a_due_date_attribute_should_with_a_due_date_attribute
|
context "with a due_date attribute" do
|
||||||
@detail = JournalDetail.new(
|
should "format the current date" do
|
||||||
|
@detail = JournalDetail.new(
|
||||||
:property => 'attr',
|
:property => 'attr',
|
||||||
:old_value => '2010-01-01',
|
:old_value => '2010-01-01',
|
||||||
:value => '2010-01-31',
|
:value => '2010-01-31',
|
||||||
:prop_key => 'due_date'
|
:prop_key => 'due_date'
|
||||||
)
|
)
|
||||||
with_settings :date_format => '%m/%d/%Y' do
|
with_settings :date_format => '%m/%d/%Y' do
|
||||||
assert_match "01/31/2010", show_detail(@detail, true)
|
assert_match "01/31/2010", show_detail(@detail, true)
|
||||||
|
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',
|
||||||
:value => '2010-01-31',
|
:value => '2010-01-31',
|
||||||
:prop_key => 'due_date'
|
:prop_key => 'due_date'
|
||||||
)
|
)
|
||||||
with_settings :date_format => '%m/%d/%Y' do
|
with_settings :date_format => '%m/%d/%Y' do
|
||||||
assert_match "01/01/2010", show_detail(@detail, true)
|
assert_match "01/01/2010", show_detail(@detail, true)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue