jro_apps/redmine Commit - r3606:1be15816dd30

Adds test helpers for test repositories....

Jean-Philippe Lang -

r3606:1be15816dd30

parent child

Context file:

r3606:1be15816dd30

test/functional/repositories_subversion_controller_test.rb +1 -4

                        :repositories, :issues, :issue_statuses, :changesets, :changes,
                        :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
-              # No '..' in the repository path for svn
-              REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/subversion_repository'
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 User.current = nil
               end
-              if File.directory?(REPOSITORY_PATH)
+              if repository_configured?('subversion')
                 def test_show
                   get :show, :id => 1
                   assert_response :success

test/test_helper.rb +10 0

@@ -84,6 +84,16 class ActiveSupport::TestCase
84	return nil	84	return nil
85	end	85	end
86		86
		87	# Returns the path to the test +vendor+ repository
		88	def self.repository_path(vendor)
		89	File.join(RAILS_ROOT.gsub(%r{config\/\.\.}, ''), "/tmp/test/#{vendor.downcase}_repository")
		90	end
		91
		92	# Returns true if the +vendor+ test repository is configured
		93	def self.repository_configured?(vendor)
		94	File.directory?(repository_path(vendor))
		95	end
		96
87	# Shoulda macros	97	# Shoulda macros
88	def self.should_render_404	98	def self.should_render_404
89	should_respond_with :not_found	99	should_respond_with :not_found

test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb +2 -4

             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-            require 'mkmf'
             require File.dirname(__FILE__) + '/../../../../../test_helper'
             class SubversionAdapterTest < ActiveSupport::TestCase
-              if find_executable0('svn')
+              if repository_configured?('subversion')
                 def test_client_version
                   v = Redmine::Scm::Adapters::SubversionAdapter.client_version
                   assert v.is_a?(Array)
                 end
               else
-                puts "Subversion binary NOT FOUND. Skipping unit tests !!!"
+                puts "Subversion test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/repository_subversion_test.rb +2 -5

             class RepositorySubversionTest < ActiveSupport::TestCase
               fixtures :projects
-              # No '..' in the repository path for svn
-              REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/subversion_repository'
               def setup
                 @project = Project.find(1)
-                assert @repository = Repository::Subversion.create(:project => @project, :url => "file:///#{REPOSITORY_PATH}")
+                assert @repository = Repository::Subversion.create(:project => @project, :url => "file:///#{self.class.repository_path('subversion')}")
               end
-              if File.directory?(REPOSITORY_PATH)
+              if repository_configured?('subversion')
                 def test_fetch_changesets_from_scratch
                   @repository.fetch_changesets
                   @repository.reload

General Comments 0

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

No TODOs yet

	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