kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed assertions to make them work with Rails2/3 ruby1.8/1.9 different behaviours.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9107 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-03-05 10:55:19 +00:00
parent d4372ab747
commit 97ca65d1b2
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/unit/user_test.rb
View File

@ -54,8 +54,7 @@ class UserTest < ActiveSupport::TestCase
u = User.new u = User.new
u.mail = '' u.mail = ''
assert !u.valid? assert !u.valid?
assert_equal I18n.translate('activerecord.errors.messages.blank'), assert_include I18n.translate('activerecord.errors.messages.blank'), u.errors[:mail]
u.errors[:mail].to_s
end end
def test_login_length_validation def test_login_length_validation
@ -110,8 +109,7 @@ class UserTest < ActiveSupport::TestCase
u.login = 'NewUser' u.login = 'NewUser'
u.password, u.password_confirmation = "password", "password" u.password, u.password_confirmation = "password", "password"
assert !u.save assert !u.save
assert_equal I18n.translate('activerecord.errors.messages.taken'), assert_include I18n.translate('activerecord.errors.messages.taken'), u.errors[:login]
u.errors[:login].to_s
end end
end end
@ -125,8 +123,7 @@ class UserTest < ActiveSupport::TestCase
u.login = 'newuser2' u.login = 'newuser2'
u.password, u.password_confirmation = "password", "password" u.password, u.password_confirmation = "password", "password"
assert !u.save assert !u.save
assert_equal I18n.translate('activerecord.errors.messages.taken'), assert_include I18n.translate('activerecord.errors.messages.taken'), u.errors[:mail]
u.errors[:mail].to_s
end end
def test_update def test_update

4
test/unit/version_test.rb
View File

@ -33,8 +33,8 @@ class VersionTest < ActiveSupport::TestCase
def test_invalid_effective_date_validation def test_invalid_effective_date_validation
v = Version.new(:project => Project.find(1), :name => '1.1', :effective_date => '99999-01-01') v = Version.new(:project => Project.find(1), :name => '1.1', :effective_date => '99999-01-01')
assert !v.save assert !v.save
assert_equal I18n.translate('activerecord.errors.messages.not_a_date'), assert_include I18n.translate('activerecord.errors.messages.not_a_date'),
v.errors[:effective_date].to_s v.errors[:effective_date]
end end
def test_progress_should_be_0_with_no_assigned_issues def test_progress_should_be_0_with_no_assigned_issues

12
test/unit/wiki_page_test.rb
View File

@ -85,18 +85,18 @@ class WikiPageTest < ActiveSupport::TestCase
# A page that doesn't exist # A page that doesn't exist
page.parent_title = 'Unknown title' page.parent_title = 'Unknown title'
assert !page.save assert !page.save
assert_equal I18n.translate('activerecord.errors.messages.invalid'), assert_include I18n.translate('activerecord.errors.messages.invalid'),
page.errors[:parent_title].to_s page.errors[:parent_title]
# A child page # A child page
page.parent_title = 'Page_with_an_inline_image' page.parent_title = 'Page_with_an_inline_image'
assert !page.save assert !page.save
assert_equal I18n.translate('activerecord.errors.messages.circular_dependency'), assert_include I18n.translate('activerecord.errors.messages.circular_dependency'),
page.errors[:parent_title].to_s page.errors[:parent_title]
# The page itself # The page itself
page.parent_title = 'CookBook_documentation' page.parent_title = 'CookBook_documentation'
assert !page.save assert !page.save
assert_equal I18n.translate('activerecord.errors.messages.circular_dependency'), assert_include I18n.translate('activerecord.errors.messages.circular_dependency'),
page.errors[:parent_title].to_s page.errors[:parent_title]
page.parent_title = 'Another_page' page.parent_title = 'Another_page'
assert page.save assert page.save
end end