From 32e3d6e1b11ab21026d8d0d4232ca93f7802579b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 18 Jun 2012 18:34:01 +0000
Subject: [PATCH] Merged r9861 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9862 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .../repositories_git_controller_test.rb       | 20 +++++++++----------
 test/unit/repository_git_test.rb              | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index aba68b1ee..52f3c6509 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -29,16 +29,6 @@ class RepositoriesGitControllerTest < ActionController::TestCase
   CHAR_1_HEX = "\xc3\x9c"
   NUM_REV = 28
 
-  ## Ruby uses ANSI api to fork a process on Windows.
-  ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
-  ## and these are incompatible with ASCII.
-  ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
-  ## http://code.google.com/p/msysgit/issues/detail?id=80
-  ## So, Latin-1 path tests fail on Japanese Windows
-  WINDOWS_PASS = (Redmine::Platform.mswin? &&
-                       Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10]))
-  WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10"
-
   ## Git, Mercurial and CVS path encodings are binary.
   ## Subversion supports URL encoding for path.
   ## Redmine Mercurial adapter and extension use URL encoding.
@@ -97,6 +87,16 @@ class RepositoriesGitControllerTest < ActionController::TestCase
   end
 
   if File.directory?(REPOSITORY_PATH)
+    ## Ruby uses ANSI api to fork a process on Windows.
+    ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
+    ## and these are incompatible with ASCII.
+    ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
+    ## http://code.google.com/p/msysgit/issues/detail?id=80
+    ## So, Latin-1 path tests fail on Japanese Windows
+    WINDOWS_PASS = (Redmine::Platform.mswin? &&
+                         Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10]))
+    WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10"
+
     def test_get_new
       @request.session[:user_id] = 1
       @project.repository.destroy
diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb
index 9f053df57..f2df14be5 100644
--- a/test/unit/repository_git_test.rb
+++ b/test/unit/repository_git_test.rb
@@ -31,16 +31,6 @@ class RepositoryGitTest < ActiveSupport::TestCase
   FELIX_HEX  = "Felix Sch\xC3\xA4fer"
   CHAR_1_HEX = "\xc3\x9c"
 
-  ## Ruby uses ANSI api to fork a process on Windows.
-  ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
-  ## and these are incompatible with ASCII.
-  ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
-  ## http://code.google.com/p/msysgit/issues/detail?id=80
-  ## So, Latin-1 path tests fail on Japanese Windows
-  WINDOWS_PASS = (Redmine::Platform.mswin? &&
-                       Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10]))
-  WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10"
-
   ## Git, Mercurial and CVS path encodings are binary.
   ## Subversion supports URL encoding for path.
   ## Redmine Mercurial adapter and extension use URL encoding.
@@ -89,6 +79,16 @@ class RepositoryGitTest < ActiveSupport::TestCase
   end
 
   if File.directory?(REPOSITORY_PATH)
+    ## Ruby uses ANSI api to fork a process on Windows.
+    ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
+    ## and these are incompatible with ASCII.
+    ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
+    ## http://code.google.com/p/msysgit/issues/detail?id=80
+    ## So, Latin-1 path tests fail on Japanese Windows
+    WINDOWS_PASS = (Redmine::Platform.mswin? &&
+                         Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10]))
+    WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10"
+
     def test_scm_available
       klass = Repository::Git
       assert_equal "Git", klass.scm_name
-- 
2.39.5