jro_apps/redmine Commit - r5083:0597adfe5313

scm: filesystem: update test repository for non ascii text files displaying (#6256)....

Toshi MARUYAMA -

r5083:0597adfe5313

parent child

Context file:

r5083:0597adfe5313

Collapse all files

test/fixtures/repositories/filesystem_repository.tar.gz binary modified 0 0

NO CONTENT: modified file, binary diff hidden

test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb +5 -5

             require File.expand_path('../../../../../../test_helper', __FILE__)
             class FilesystemAdapterTest < ActiveSupport::TestCase
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/filesystem_repository'
               if File.directory?(REPOSITORY_PATH)
                 def setup
                   @adapter = Redmine::Scm::Adapters::FilesystemAdapter.new(REPOSITORY_PATH)
                 end
                 def test_entries
-                  assert_equal 2, @adapter.entries.size
+                  assert_equal 3, @adapter.entries.size
-                  assert_equal ["dir", "test"], @adapter.entries.collect(&:name)
+                  assert_equal ["dir", "japanese", "test"], @adapter.entries.collect(&:name)
-                  assert_equal ["dir", "test"], @adapter.entries(nil).collect(&:name)
+                  assert_equal ["dir", "japanese", "test"], @adapter.entries(nil).collect(&:name)
-                  assert_equal ["dir", "test"], @adapter.entries("/").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
                 def test_cat
                   assert_equal "TEST CAT\n", @adapter.cat("test")
                   assert_equal "TEST CAT\n", @adapter.cat("/test")
                   # Revision number is ignored
                   assert_equal "TEST CAT\n", @adapter.cat("/test", 1)
                 end
               else
                 puts "Filesystem test repository NOT FOUND. Skipping unit tests !!! See doc/RUNNING_TESTS."
                 def test_fake; assert true end
               end
             end

test/unit/repository_filesystem_test.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class RepositoryFilesystemTest < ActiveSupport::TestCase
               fixtures :projects
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/filesystem_repository'
               def setup
                 @project = Project.find(3)
                 Setting.enabled_scm << 'Filesystem' unless Setting.enabled_scm.include?('Filesystem')
                 assert @repository = Repository::Filesystem.create(
                                         :project => @project, :url => REPOSITORY_PATH)
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 0, @repository.changesets.count
                   assert_equal 0, @repository.changes.count
                 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
                 def test_cat
                   assert_equal "TEST CAT\n", @repository.scm.cat("test")
                 end
               else
                 puts "Filesystem test repository NOT FOUND. Skipping unit tests !!! See doc/RUNNING_TESTS."
                 def test_fake; assert true end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages