meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-04-03 14:31:38 +00:00
Code Issues Releases Wiki Activity

Merge r21880 from trunk to 5.0-stable (#37718).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21881 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2022-10-02 07:29:20 +00:00
parent a4aa6d0c1f
commit 396d855807
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/scm/adapters/subversion_adapter.rb
View File

@ -115,7 +115,7 @@ module Redmine
entries << entries <<
Entry.new( Entry.new(
{ {
:name => CGI.unescape(name), :name => Addressable::URI.unescape(name),
:path => ((path.empty? ? "" : "#{path}/") + name), :path => ((path.empty? ? "" : "#{path}/") + name),
:kind => entry['kind'], :kind => entry['kind'],
:size => ((s = entry['size']) ? s['__content__'].to_i : nil), :size => ((s = entry['size']) ? s['__content__'].to_i : nil),

BIN
test/fixtures/repositories/subversion_repository.dump.gz vendored
View File

Binary file not shown.

5
test/functional/repositories_subversion_controller_test.rb
View File

@ -27,7 +27,7 @@ class RepositoriesSubversionControllerTest < Redmine::RepositoryControllerTest
:issue_categories, :enumerations, :custom_fields, :custom_values, :trackers :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
PRJ_ID = 3 PRJ_ID = 3
NUM_REV = 13 NUM_REV = 14
def setup def setup
super super
@ -121,9 +121,10 @@ class RepositoriesSubversionControllerTest < Redmine::RepositoryControllerTest
assert_response :success assert_response :success
assert_select 'table.entries tbody' do assert_select 'table.entries tbody' do
assert_select 'tr', 5 assert_select 'tr', 6
assert_select 'tr.dir td.filename a', :text => '[folder_with_brackets]' assert_select 'tr.dir td.filename a', :text => '[folder_with_brackets]'
assert_select 'tr.dir td.filename a', :text => 'folder' assert_select 'tr.dir td.filename a', :text => 'folder'
assert_select 'tr.file td.filename a', :text => '+.md'
assert_select 'tr.file td.filename a', :text => '.project' assert_select 'tr.file td.filename a', :text => '.project'
assert_select 'tr.file td.filename a', :text => 'helloworld.c' assert_select 'tr.file td.filename a', :text => 'helloworld.c'
assert_select 'tr.file td.filename a', :text => 'textfile.txt' assert_select 'tr.file td.filename a', :text => 'textfile.txt'

4
test/unit/repository_subversion_test.rb
View File

@ -24,7 +24,7 @@ class RepositorySubversionTest < ActiveSupport::TestCase
include Redmine::I18n include Redmine::I18n
NUM_REV = 13 NUM_REV = 14
def setup def setup
User.current = nil User.current = nil
@ -100,7 +100,7 @@ class RepositorySubversionTest < ActiveSupport::TestCase
@project.reload @project.reload
assert_equal NUM_REV, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
assert_equal 23, @repository.filechanges.count assert_equal 24, @repository.filechanges.count
assert_equal 'Initial import.', @repository.changesets.find_by_revision('1').comments assert_equal 'Initial import.', @repository.changesets.find_by_revision('1').comments
end end