##// END OF EJS Templates
Changed assertions to make them work with Rails2/3 ruby1.8/1.9 different behaviours....
Jean-Philippe Lang -
r8987:97ca65d1b217
parent child
Show More
@@ -54,8 +54,7 class UserTest < ActiveSupport::TestCase
54 54 u = User.new
55 55 u.mail = ''
56 56 assert !u.valid?
57 assert_equal I18n.translate('activerecord.errors.messages.blank'),
58 u.errors[:mail].to_s
57 assert_include I18n.translate('activerecord.errors.messages.blank'), u.errors[:mail]
59 58 end
60 59
61 60 def test_login_length_validation
@@ -110,8 +109,7 class UserTest < ActiveSupport::TestCase
110 109 u.login = 'NewUser'
111 110 u.password, u.password_confirmation = "password", "password"
112 111 assert !u.save
113 assert_equal I18n.translate('activerecord.errors.messages.taken'),
114 u.errors[:login].to_s
112 assert_include I18n.translate('activerecord.errors.messages.taken'), u.errors[:login]
115 113 end
116 114 end
117 115
@@ -125,8 +123,7 class UserTest < ActiveSupport::TestCase
125 123 u.login = 'newuser2'
126 124 u.password, u.password_confirmation = "password", "password"
127 125 assert !u.save
128 assert_equal I18n.translate('activerecord.errors.messages.taken'),
129 u.errors[:mail].to_s
126 assert_include I18n.translate('activerecord.errors.messages.taken'), u.errors[:mail]
130 127 end
131 128
132 129 def test_update
@@ -33,8 +33,8 class VersionTest < ActiveSupport::TestCase
33 33 def test_invalid_effective_date_validation
34 34 v = Version.new(:project => Project.find(1), :name => '1.1', :effective_date => '99999-01-01')
35 35 assert !v.save
36 assert_equal I18n.translate('activerecord.errors.messages.not_a_date'),
37 v.errors[:effective_date].to_s
36 assert_include I18n.translate('activerecord.errors.messages.not_a_date'),
37 v.errors[:effective_date]
38 38 end
39 39
40 40 def test_progress_should_be_0_with_no_assigned_issues
@@ -85,18 +85,18 class WikiPageTest < ActiveSupport::TestCase
85 85 # A page that doesn't exist
86 86 page.parent_title = 'Unknown title'
87 87 assert !page.save
88 assert_equal I18n.translate('activerecord.errors.messages.invalid'),
89 page.errors[:parent_title].to_s
88 assert_include I18n.translate('activerecord.errors.messages.invalid'),
89 page.errors[:parent_title]
90 90 # A child page
91 91 page.parent_title = 'Page_with_an_inline_image'
92 92 assert !page.save
93 assert_equal I18n.translate('activerecord.errors.messages.circular_dependency'),
94 page.errors[:parent_title].to_s
93 assert_include I18n.translate('activerecord.errors.messages.circular_dependency'),
94 page.errors[:parent_title]
95 95 # The page itself
96 96 page.parent_title = 'CookBook_documentation'
97 97 assert !page.save
98 assert_equal I18n.translate('activerecord.errors.messages.circular_dependency'),
99 page.errors[:parent_title].to_s
98 assert_include I18n.translate('activerecord.errors.messages.circular_dependency'),
99 page.errors[:parent_title]
100 100 page.parent_title = 'Another_page'
101 101 assert page.save
102 102 end
General Comments 0
You need to be logged in to leave comments. Login now