Merged r9619 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9620 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-05-04 16:58:08 +00:00
parent 9db20cd02c
commit e9ac98b249
2 changed files with 10 additions and 1 deletions

View File

@ -141,7 +141,7 @@ class Repository < ActiveRecord::Base
elsif repository.is_default?
1
else
identifier <=> repository.identifier
identifier.to_s <=> repository.identifier.to_s
end
end

View File

@ -318,4 +318,13 @@ class RepositoryTest < ActiveSupport::TestCase
assert_equal "test_value_23",
repo.extra_info["test_2"]["test_23"]
end
def test_sort_should_not_raise_an_error_with_nil_identifiers
r1 = Repository.new
r2 = Repository.new
assert_nothing_raised do
[r1, r2].sort
end
end
end