diff options
| -rw-r--r-- | test/functional/repositories_subversion_controller_test.rb | 6 | ||||
| -rw-r--r-- | test/test_helper.rb | 11 | ||||
| -rw-r--r-- | test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb | 7 | ||||
| -rw-r--r-- | test/unit/repository_subversion_test.rb | 6 |
4 files changed, 18 insertions, 12 deletions
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb index 7ca863d1f..26d15cd55 100644 --- a/test/functional/repositories_subversion_controller_test.rb +++ b/test/functional/repositories_subversion_controller_test.rb @@ -1,5 +1,5 @@ -# redMine - project management software -# Copyright (C) 2006-2008 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 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 @@ -37,7 +37,7 @@ class RepositoriesSubversionControllerTest < ActionController::TestCase @project = Project.find(PRJ_ID) @repository = Repository::Subversion.create(:project => @project, - :url => "file://#{self.class.repository_path('subversion')}") + :url => self.class.subversion_repository_url) assert @repository end diff --git a/test/test_helper.rb b/test/test_helper.rb index 230cc5869..647189c09 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,5 +1,5 @@ -# redMine - project management software -# Copyright (C) 2006 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 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 @@ -109,6 +109,13 @@ class ActiveSupport::TestCase File.join(RAILS_ROOT.gsub(%r{config\/\.\.}, ''), "/tmp/test/#{vendor.downcase}_repository") 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 def self.repository_configured?(vendor) File.directory?(repository_path(vendor)) diff --git a/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb index 1d8b9cbe6..bc769562c 100644 --- a/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb @@ -1,5 +1,5 @@ -# redMine - project management software -# Copyright (C) 2006-2008 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 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 @@ -24,8 +24,7 @@ begin if repository_configured?('subversion') def setup - repo_path = "file://#{self.class.repository_path('subversion')}" - @adapter = Redmine::Scm::Adapters::SubversionAdapter.new(repo_path) + @adapter = Redmine::Scm::Adapters::SubversionAdapter.new(self.class.subversion_repository_url) end def test_client_version diff --git a/test/unit/repository_subversion_test.rb b/test/unit/repository_subversion_test.rb index ca3bd9b48..071660c2d 100644 --- a/test/unit/repository_subversion_test.rb +++ b/test/unit/repository_subversion_test.rb @@ -1,5 +1,5 @@ -# redMine - project management software -# Copyright (C) 2006-2007 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 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 @@ -23,7 +23,7 @@ class RepositorySubversionTest < ActiveSupport::TestCase def setup @project = Project.find(3) @repository = Repository::Subversion.create(:project => @project, - :url => "file://#{self.class.repository_path('subversion')}") + :url => self.class.subversion_repository_url) assert @repository end |