diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-04 16:58:08 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-04 16:58:08 +0000 |
| commit | e9ac98b249a3f8b31562e4e8325a17e4f34febcc (patch) | |
| tree | 7d1f223b4c981fc389b486e02f03d775706d3aec | |
| parent | 9db20cd02cc3bd789e167a586f35170841b8dae5 (diff) | |
| download | redmine-e9ac98b249a3f8b31562e4e8325a17e4f34febcc.tar.gz redmine-e9ac98b249a3f8b31562e4e8325a17e4f34febcc.zip | |
Merged r9619 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9620 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/repository.rb | 2 | ||||
| -rw-r--r-- | test/unit/repository_test.rb | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 5b1d68111..e3e67505a 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -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 diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb index 1fe246d8e..466babb38 100644 --- a/test/unit/repository_test.rb +++ b/test/unit/repository_test.rb @@ -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 |