##// END OF EJS Templates
Changed assertions to make them work with Rails2/3 ruby1.8/1.9 different behaviours....
Jean-Philippe Lang -
r8988:aa9238912b97
parent child
Show More
@@ -51,7 +51,7 class AuthSourceLdapTest < ActiveSupport::TestCase
51 a = AuthSourceLdap.new(:name => 'My LDAP', :host => 'ldap.example.net', :port => 389, :attr_login => 'sn')
51 a = AuthSourceLdap.new(:name => 'My LDAP', :host => 'ldap.example.net', :port => 389, :attr_login => 'sn')
52 a.filter = "(mail=*@redmine.org"
52 a.filter = "(mail=*@redmine.org"
53 assert !a.valid?
53 assert !a.valid?
54 assert_equal "is invalid", a.errors[:filter].to_s
54 assert_include "is invalid", a.errors[:filter]
55
55
56 a.filter = "(mail=*@redmine.org)"
56 a.filter = "(mail=*@redmine.org)"
57 assert a.valid?
57 assert a.valid?
@@ -38,8 +38,8 class CustomFieldTest < ActiveSupport::TestCase
38 def test_regexp_validation
38 def test_regexp_validation
39 field = IssueCustomField.new(:name => 'regexp', :field_format => 'text', :regexp => '[a-z0-9')
39 field = IssueCustomField.new(:name => 'regexp', :field_format => 'text', :regexp => '[a-z0-9')
40 assert !field.save
40 assert !field.save
41 assert_equal I18n.t('activerecord.errors.messages.invalid'),
41 assert_include I18n.t('activerecord.errors.messages.invalid'),
42 field.errors[:regexp].to_s
42 field.errors[:regexp]
43 field.regexp = '[a-z0-9]'
43 field.regexp = '[a-z0-9]'
44 assert field.save
44 assert field.save
45 end
45 end
@@ -78,7 +78,7 class MemberTest < ActiveSupport::TestCase
78 set_language_if_valid 'fr'
78 set_language_if_valid 'fr'
79 member = Member.new(:project_id => 1, :user_id => user.id, :role_ids => [])
79 member = Member.new(:project_id => 1, :user_id => user.id, :role_ids => [])
80 assert !member.save
80 assert !member.save
81 assert_equal I18n.translate('activerecord.errors.messages.empty'), member.errors[:role].to_s
81 assert_include I18n.translate('activerecord.errors.messages.empty'), member.errors[:role]
82 str = "R\xc3\xb4le doit \xc3\xaatre renseign\xc3\xa9(e)"
82 str = "R\xc3\xb4le doit \xc3\xaatre renseign\xc3\xa9(e)"
83 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
83 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
84 assert_equal str, [member.errors.full_messages].flatten.join
84 assert_equal str, [member.errors.full_messages].flatten.join
@@ -132,8 +132,8 class RepositoryTest < ActiveSupport::TestCase
132 repository = Repository::Subversion.new(
132 repository = Repository::Subversion.new(
133 :project => Project.find(3), :url => "svn://localhost")
133 :project => Project.find(3), :url => "svn://localhost")
134 assert !repository.save
134 assert !repository.save
135 assert_equal I18n.translate('activerecord.errors.messages.invalid'),
135 assert_include I18n.translate('activerecord.errors.messages.invalid'),
136 repository.errors[:type].to_s
136 repository.errors[:type]
137 end
137 end
138 end
138 end
139
139
General Comments 0
You need to be logged in to leave comments. Login now