diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-05 11:03:26 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-05 11:03:26 +0000 |
| commit | aa9238912b97ae5d3e508294fb9cf9178c484b4a (patch) | |
| tree | 4c396ab656d4f05783ea8b1062ba6ef48d08b561 | |
| parent | 97ca65d1b217068198e9f66d1dbc5e8e7db93b38 (diff) | |
| download | redmine-aa9238912b97ae5d3e508294fb9cf9178c484b4a.tar.gz redmine-aa9238912b97ae5d3e508294fb9cf9178c484b4a.zip | |
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@9108 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | test/unit/auth_source_ldap_test.rb | 2 | ||||
| -rw-r--r-- | test/unit/custom_field_test.rb | 4 | ||||
| -rw-r--r-- | test/unit/member_test.rb | 2 | ||||
| -rw-r--r-- | test/unit/repository_test.rb | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/test/unit/auth_source_ldap_test.rb b/test/unit/auth_source_ldap_test.rb index 55e1479b8..4955a4dc8 100644 --- a/test/unit/auth_source_ldap_test.rb +++ b/test/unit/auth_source_ldap_test.rb @@ -51,7 +51,7 @@ class AuthSourceLdapTest < ActiveSupport::TestCase a = AuthSourceLdap.new(:name => 'My LDAP', :host => 'ldap.example.net', :port => 389, :attr_login => 'sn') a.filter = "(mail=*@redmine.org" assert !a.valid? - assert_equal "is invalid", a.errors[:filter].to_s + assert_include "is invalid", a.errors[:filter] a.filter = "(mail=*@redmine.org)" assert a.valid? diff --git a/test/unit/custom_field_test.rb b/test/unit/custom_field_test.rb index db7a637fd..529aa699d 100644 --- a/test/unit/custom_field_test.rb +++ b/test/unit/custom_field_test.rb @@ -38,8 +38,8 @@ class CustomFieldTest < ActiveSupport::TestCase def test_regexp_validation field = IssueCustomField.new(:name => 'regexp', :field_format => 'text', :regexp => '[a-z0-9') assert !field.save - assert_equal I18n.t('activerecord.errors.messages.invalid'), - field.errors[:regexp].to_s + assert_include I18n.t('activerecord.errors.messages.invalid'), + field.errors[:regexp] field.regexp = '[a-z0-9]' assert field.save end diff --git a/test/unit/member_test.rb b/test/unit/member_test.rb index 5fb8b30ac..8038478f4 100644 --- a/test/unit/member_test.rb +++ b/test/unit/member_test.rb @@ -78,7 +78,7 @@ class MemberTest < ActiveSupport::TestCase set_language_if_valid 'fr' member = Member.new(:project_id => 1, :user_id => user.id, :role_ids => []) assert !member.save - assert_equal I18n.translate('activerecord.errors.messages.empty'), member.errors[:role].to_s + assert_include I18n.translate('activerecord.errors.messages.empty'), member.errors[:role] str = "R\xc3\xb4le doit \xc3\xaatre renseign\xc3\xa9(e)" str.force_encoding('UTF-8') if str.respond_to?(:force_encoding) assert_equal str, [member.errors.full_messages].flatten.join diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb index 96f0ceeee..1fe246d8e 100644 --- a/test/unit/repository_test.rb +++ b/test/unit/repository_test.rb @@ -132,8 +132,8 @@ class RepositoryTest < ActiveSupport::TestCase repository = Repository::Subversion.new( :project => Project.find(3), :url => "svn://localhost") assert !repository.save - assert_equal I18n.translate('activerecord.errors.messages.invalid'), - repository.errors[:type].to_s + assert_include I18n.translate('activerecord.errors.messages.invalid'), + repository.errors[:type] end end |