From 6ee4c0bac76e454533a86ea6eadf583a453ce86a Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 5 Jan 2011 15:10:38 +0000 Subject: [PATCH] Merged r4632 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4638 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../scm/adapters/mercurial_adapter_test.rb | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb index f7b178c10..642415812 100644 --- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb @@ -1,16 +1,16 @@ require File.expand_path('../../../../../../test_helper', __FILE__) begin require 'mocha' - + class MercurialAdapterTest < ActiveSupport::TestCase - + TEMPLATES_DIR = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATES_DIR TEMPLATE_NAME = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_NAME TEMPLATE_EXTENSION = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_EXTENSION - + REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository' - if File.directory?(REPOSITORY_PATH) + if File.directory?(REPOSITORY_PATH) def setup @adapter = Redmine::Scm::Adapters::MercurialAdapter.new(REPOSITORY_PATH) end @@ -22,8 +22,8 @@ begin "Mercurial Distributed SCM (1.0.1+20080525)\n" => [1,0,1], "Mercurial Distributed SCM (1916e629a29d)\n" => nil, "Mercurial SCM Distribuito (versione 0.9.5)\n" => [0,9,5], - "(1.6)\n(1.7)\n(1.8)" => [1,6], - "(1.7.1)\r\n(1.8.1)\r\n(1.9.1)" => [1,7,1]} + "(1.6)\n(1.7)\n(1.8)" => [1,6], + "(1.7.1)\r\n(1.8.1)\r\n(1.9.1)" => [1,7,1]} to_test.each do |s, v| test_hgversion_for(s, v) @@ -31,12 +31,12 @@ begin end def test_template_path - to_test = { [0,9,5] => "0.9.5", - [1,0] => "1.0", - [] => "1.0", - [1,0,1] => "1.0", - [1,7] => "1.0", - [1,7,1] => "1.0"} + to_test = { [0,9,5] => "0.9.5", + [1,0] => "1.0", + [] => "1.0", + [1,0,1] => "1.0", + [1,7] => "1.0", + [1,7,1] => "1.0" } to_test.each do |v, template| test_template_path_for(v, template) end -- 2.39.5