Changed assertions to make them work with Rails2/3 ruby1.8/1.9 different behaviours.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9107 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
d4372ab747
commit
97ca65d1b2
|
@ -54,8 +54,7 @@ class UserTest < ActiveSupport::TestCase
|
|||
u = User.new
|
||||
u.mail = ''
|
||||
assert !u.valid?
|
||||
assert_equal I18n.translate('activerecord.errors.messages.blank'),
|
||||
u.errors[:mail].to_s
|
||||
assert_include I18n.translate('activerecord.errors.messages.blank'), u.errors[:mail]
|
||||
end
|
||||
|
||||
def test_login_length_validation
|
||||
|
@ -110,8 +109,7 @@ class UserTest < ActiveSupport::TestCase
|
|||
u.login = 'NewUser'
|
||||
u.password, u.password_confirmation = "password", "password"
|
||||
assert !u.save
|
||||
assert_equal I18n.translate('activerecord.errors.messages.taken'),
|
||||
u.errors[:login].to_s
|
||||
assert_include I18n.translate('activerecord.errors.messages.taken'), u.errors[:login]
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -125,8 +123,7 @@ class UserTest < ActiveSupport::TestCase
|
|||
u.login = 'newuser2'
|
||||
u.password, u.password_confirmation = "password", "password"
|
||||
assert !u.save
|
||||
assert_equal I18n.translate('activerecord.errors.messages.taken'),
|
||||
u.errors[:mail].to_s
|
||||
assert_include I18n.translate('activerecord.errors.messages.taken'), u.errors[:mail]
|
||||
end
|
||||
|
||||
def test_update
|
||||
|
|
|
@ -33,8 +33,8 @@ class VersionTest < ActiveSupport::TestCase
|
|||
def test_invalid_effective_date_validation
|
||||
v = Version.new(:project => Project.find(1), :name => '1.1', :effective_date => '99999-01-01')
|
||||
assert !v.save
|
||||
assert_equal I18n.translate('activerecord.errors.messages.not_a_date'),
|
||||
v.errors[:effective_date].to_s
|
||||
assert_include I18n.translate('activerecord.errors.messages.not_a_date'),
|
||||
v.errors[:effective_date]
|
||||
end
|
||||
|
||||
def test_progress_should_be_0_with_no_assigned_issues
|
||||
|
|
|
@ -85,18 +85,18 @@ class WikiPageTest < ActiveSupport::TestCase
|
|||
# A page that doesn't exist
|
||||
page.parent_title = 'Unknown title'
|
||||
assert !page.save
|
||||
assert_equal I18n.translate('activerecord.errors.messages.invalid'),
|
||||
page.errors[:parent_title].to_s
|
||||
assert_include I18n.translate('activerecord.errors.messages.invalid'),
|
||||
page.errors[:parent_title]
|
||||
# A child page
|
||||
page.parent_title = 'Page_with_an_inline_image'
|
||||
assert !page.save
|
||||
assert_equal I18n.translate('activerecord.errors.messages.circular_dependency'),
|
||||
page.errors[:parent_title].to_s
|
||||
assert_include I18n.translate('activerecord.errors.messages.circular_dependency'),
|
||||
page.errors[:parent_title]
|
||||
# The page itself
|
||||
page.parent_title = 'CookBook_documentation'
|
||||
assert !page.save
|
||||
assert_equal I18n.translate('activerecord.errors.messages.circular_dependency'),
|
||||
page.errors[:parent_title].to_s
|
||||
assert_include I18n.translate('activerecord.errors.messages.circular_dependency'),
|
||||
page.errors[:parent_title]
|
||||
page.parent_title = 'Another_page'
|
||||
assert page.save
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue