kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes subversion tests not running on win32. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5175 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-03-20 18:25:38 +00:00
parent 85462261ac
commit f279b48288
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/functional/repositories_subversion_controller_test.rb
View File

@ -1,5 +1,5 @@
# redMine - project management software # Redmine - project management software
# Copyright (C) 2006-2008 Jean-Philippe Lang # Copyright (C) 2006-2011 Jean-Philippe Lang
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
@ -37,7 +37,7 @@ class RepositoriesSubversionControllerTest < ActionController::TestCase
@project = Project.find(PRJ_ID) @project = Project.find(PRJ_ID)
@repository = Repository::Subversion.create(:project => @project, @repository = Repository::Subversion.create(:project => @project,
:url => "file://#{self.class.repository_path('subversion')}") :url => self.class.subversion_repository_url)
assert @repository assert @repository
end end

11
test/test_helper.rb
View File

@ -1,5 +1,5 @@
# redMine - project management software # Redmine - project management software
# Copyright (C) 2006 Jean-Philippe Lang # Copyright (C) 2006-2011 Jean-Philippe Lang
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
@ -109,6 +109,13 @@ class ActiveSupport::TestCase
File.join(RAILS_ROOT.gsub(%r{config\/\.\.}, ''), "/tmp/test/#{vendor.downcase}_repository") File.join(RAILS_ROOT.gsub(%r{config\/\.\.}, ''), "/tmp/test/#{vendor.downcase}_repository")
end end
# Returns the url of the subbversion test repository
def self.subversion_repository_url
path = repository_path('subversion')
path = '/' + path unless path.starts_with?('/')
"file://#{path}"
end
# Returns true if the +vendor+ test repository is configured # Returns true if the +vendor+ test repository is configured
def self.repository_configured?(vendor) def self.repository_configured?(vendor)
File.directory?(repository_path(vendor)) File.directory?(repository_path(vendor))

7
test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
View File

@ -1,5 +1,5 @@
# redMine - project management software # Redmine - project management software
# Copyright (C) 2006-2008 Jean-Philippe Lang # Copyright (C) 2006-2011 Jean-Philippe Lang
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
@ -24,8 +24,7 @@ begin
if repository_configured?('subversion') if repository_configured?('subversion')
def setup def setup
repo_path = "file://#{self.class.repository_path('subversion')}" @adapter = Redmine::Scm::Adapters::SubversionAdapter.new(self.class.subversion_repository_url)
@adapter = Redmine::Scm::Adapters::SubversionAdapter.new(repo_path)
end end
def test_client_version def test_client_version

6
test/unit/repository_subversion_test.rb
View File

@ -1,5 +1,5 @@
# redMine - project management software # Redmine - project management software
# Copyright (C) 2006-2007 Jean-Philippe Lang # Copyright (C) 2006-2011 Jean-Philippe Lang
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
@ -23,7 +23,7 @@ class RepositorySubversionTest < ActiveSupport::TestCase
def setup def setup
@project = Project.find(3) @project = Project.find(3)
@repository = Repository::Subversion.create(:project => @project, @repository = Repository::Subversion.create(:project => @project,
:url => "file://#{self.class.repository_path('subversion')}") :url => self.class.subversion_repository_url)
assert @repository assert @repository
end end