Mercurial adapter tests fix (#1469).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1563 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 28b842c274b0bede37c740f33e36de7de90ceb44..a00ff4c49e36cd503aba6bcb25a6fa27566abc73 100644 (file)
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -192,8 +192,6 @@ module Redmine
                         end
         end
         
-        private
-        
         def hgversion_from_command_line
           @hgversion ||= %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1]
         end

diff --git a/test/unit/mercurial_adapter_test.rb b/test/unit/mercurial_adapter_test.rb
index b4aaaec6118cf4b1ef4c484dcab303448639c43d..7c1ef85fd6670c81fc60bd1c52ac4ba8c8e26eb0 100644 (file)
--- a/test/unit/mercurial_adapter_test.rb
+++ b/test/unit/mercurial_adapter_test.rb
@@ -4,9 +4,9 @@ begin
   
   class MercurialAdapterTest < Test::Unit::TestCase
     
-    TEMPLATES_DIR = "#{RAILS_ROOT}/extra/mercurial"
-    TEMPLATE_NAME = "hg-template"
-    TEMPLATE_EXTENSION = "tmpl"
+    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'