Fixed that Repository#entries returns an Array.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9804 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 5ceeb7c8cf31122f255e39f6f8b4a88e549e5231..d487a0f301f5d573c85fbfe4c27944ea16293c0d 100644 (file)
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -278,7 +278,7 @@ module Redmine
 
       class Entries < Array
         def sort_by_name
-          sort {|x,y|
+          dup.sort! {|x,y|
             if x.kind == y.kind
               x.name.to_s <=> y.name.to_s
             else

diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb
index 2713f9473721414276f56dae718f600e8b1939f0..12bc0204010a6d0191dbeb10e637199829b08f98 100644 (file)
--- a/test/unit/repository_bazaar_test.rb
+++ b/test/unit/repository_bazaar_test.rb
@@ -88,6 +88,7 @@ class RepositoryBazaarTest < ActiveSupport::TestCase
 
     def test_entries
       entries = @repository.entries
+      assert_kind_of Redmine::Scm::Adapters::Entries, entries
       assert_equal 2, entries.size
 
       assert_equal 'dir', entries[0].kind

diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb
index 0fc1873c797250144b2d1cce612e16b646b134a7..b718246b2b9876903152aff9962d7ab7c42f3268 100644 (file)
--- a/test/unit/repository_cvs_test.rb
+++ b/test/unit/repository_cvs_test.rb
@@ -158,6 +158,7 @@ class RepositoryCvsTest < ActiveSupport::TestCase
       @project.reload
       assert_equal CHANGESETS_NUM, @repository.changesets.count
       entries = @repository.entries('', '3')
+      assert_kind_of Redmine::Scm::Adapters::Entries, entries
       assert_equal 3, entries.size
       assert_equal entries[2].name, "README"
       assert_equal entries[2].lastrev.time, Time.gm(2007, 12, 13, 16, 27, 22)

diff --git a/test/unit/repository_darcs_test.rb b/test/unit/repository_darcs_test.rb
index 9923e0cbd013b11874e6d8616d656ef0aba2ae1a..53c91abb3a4cbec4e59f6119926c92947486c8b3 100644 (file)
--- a/test/unit/repository_darcs_test.rb
+++ b/test/unit/repository_darcs_test.rb
@@ -88,6 +88,11 @@ class RepositoryDarcsTest < ActiveSupport::TestCase
       assert_equal NUM_REV, @repository.changesets.count
     end
 
+    def test_entries
+      entries = @repository.entries
+      assert_kind_of Redmine::Scm::Adapters::Entries, entries
+    end
+
     def test_entries_invalid_revision
       assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets

diff --git a/test/unit/repository_filesystem_test.rb b/test/unit/repository_filesystem_test.rb
index 25e7c88a9b2a9642b1c1857209bb07220b9e512d..1cb2e7bdae60cd6a933e16be5a8b43a34510a124 100644 (file)
--- a/test/unit/repository_filesystem_test.rb
+++ b/test/unit/repository_filesystem_test.rb
@@ -70,7 +70,12 @@ class RepositoryFilesystemTest < ActiveSupport::TestCase
     end
 
     def test_entries
-      assert_equal 3, @repository.entries("", 2).size
+      entries = @repository.entries("", 2)
+      assert_kind_of Redmine::Scm::Adapters::Entries, entries
+      assert_equal 3, entries.size
+    end
+
+    def test_entries_in_directory
       assert_equal 2, @repository.entries("dir", 3).size
     end
 

diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb
index 9f053df5755a5da66f020849d9b52a6760242a3c..53233fa757bbfe3466444e410a477c7ce1fb7028 100644 (file)
--- a/test/unit/repository_git_test.rb
+++ b/test/unit/repository_git_test.rb
@@ -97,6 +97,11 @@ class RepositoryGitTest < ActiveSupport::TestCase
       assert_equal true, klass.scm_available
     end
 
+    def test_entries
+      entries = @repository.entries
+      assert_kind_of Redmine::Scm::Adapters::Entries, entries
+    end
+
     def test_fetch_changesets_from_scratch
       assert_nil @repository.extra_info
 

diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb
index 8d6e076d1ec4ef3336c4fb170658dd1fc17d0130..f643007483e22b093c83fd3e044f845a3c53b85c 100644 (file)
--- a/test/unit/repository_mercurial_test.rb
+++ b/test/unit/repository_mercurial_test.rb
@@ -81,6 +81,11 @@ class RepositoryMercurialTest < ActiveSupport::TestCase
       assert_equal true, klass.scm_available
     end
 
+    def test_entries
+      entries = @repository.entries
+      assert_kind_of Redmine::Scm::Adapters::Entries, entries
+    end
+
     def test_fetch_changesets_from_scratch
       assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets

diff --git a/test/unit/repository_subversion_test.rb b/test/unit/repository_subversion_test.rb
index 8ea8ce0c5b9ac6aab94a41e49633c59530978d18..699ef886a9f32a9a3d6479e21e0dacca7ce69d30 100644 (file)
--- a/test/unit/repository_subversion_test.rb
+++ b/test/unit/repository_subversion_test.rb
@@ -56,6 +56,11 @@ class RepositorySubversionTest < ActiveSupport::TestCase
       assert_equal NUM_REV, @repository.changesets.count
     end
 
+    def test_entries
+      entries = @repository.entries
+      assert_kind_of Redmine::Scm::Adapters::Entries, entries
+    end
+
     def test_latest_changesets
       assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets