diff --git a/test/fixtures/repositories/filesystem_repository.tar.gz b/test/fixtures/repositories/filesystem_repository.tar.gz index 7e8a4ac56..8da89339a 100644 Binary files a/test/fixtures/repositories/filesystem_repository.tar.gz and b/test/fixtures/repositories/filesystem_repository.tar.gz differ diff --git a/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb index e4722ff5a..74502cf54 100644 --- a/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb @@ -11,16 +11,16 @@ class FilesystemAdapterTest < ActiveSupport::TestCase end def test_entries - assert_equal 2, @adapter.entries.size - assert_equal ["dir", "test"], @adapter.entries.collect(&:name) - assert_equal ["dir", "test"], @adapter.entries(nil).collect(&:name) - assert_equal ["dir", "test"], @adapter.entries("/").collect(&:name) + assert_equal 3, @adapter.entries.size + assert_equal ["dir", "japanese", "test"], @adapter.entries.collect(&:name) + assert_equal ["dir", "japanese", "test"], @adapter.entries(nil).collect(&:name) + assert_equal ["dir", "japanese", "test"], @adapter.entries("/").collect(&:name) ["dir", "/dir", "/dir/", "dir/"].each do |path| assert_equal ["subdir", "dirfile"], @adapter.entries(path).collect(&:name) end # If y try to use "..", the path is ignored ["/../","dir/../", "..", "../", "/..", "dir/.."].each do |path| - assert_equal ["dir", "test"], @adapter.entries(path).collect(&:name), + assert_equal ["dir", "japanese", "test"], @adapter.entries(path).collect(&:name), ".. must be ignored in path argument" end end diff --git a/test/unit/repository_filesystem_test.rb b/test/unit/repository_filesystem_test.rb index 3347d5913..e1287d282 100644 --- a/test/unit/repository_filesystem_test.rb +++ b/test/unit/repository_filesystem_test.rb @@ -40,7 +40,7 @@ class RepositoryFilesystemTest < ActiveSupport::TestCase end def test_entries - assert_equal 2, @repository.entries("", 2).size + assert_equal 3, @repository.entries("", 2).size assert_equal 2, @repository.entries("dir", 3).size end