scm: mercurial: add instance value flag of whether "hg diff -c" supports at tests...

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4853 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index ae7f4226e9ff18d6bda77910892d015a2f0c385d..219082828dd355131150bb9661379a4d24586242 100644 (file)
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -34,6 +34,7 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
     User.current = nil
     @repository = Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
     assert @repository
+    @diff_c_support = @repository.scm.class.client_version_above?([1, 2])
   end
 
   if File.directory?(REPOSITORY_PATH)
@@ -137,7 +138,7 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
         assert_response :success
         assert_template 'diff'
 
-        if @repository.scm.class.client_version_above?([1, 2])
+        if @diff_c_support
           # Line 22 removed
           assert_tag :tag => 'th',
                      :content => '22',

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 dd84927254351342c7fa8554d1b0127e32c94b1d..e38c31ab18f38dff95da549cbed5ae380f14ca4e 100644 (file)
--- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
@@ -13,6 +13,7 @@ begin
     if File.directory?(REPOSITORY_PATH)
       def setup
         @adapter = Redmine::Scm::Adapters::MercurialAdapter.new(REPOSITORY_PATH)
+        @diff_c_support = @adapter.class.client_version_above?([1, 2])
       end
 
       def test_hgversion
@@ -73,7 +74,7 @@ begin
         assert_nil @adapter.diff(nil, '100000', '200000')
         [2, '400bb8672109', '400', 400].each do |r1|
           diff1 = @adapter.diff(nil, r1)
-          if @adapter.class.client_version_above?([1, 2])
+          if @diff_c_support
             assert_equal 28, diff1.size
             buf = diff1[24].gsub(/\r\n|\r|\n/, "")
             assert_equal "+    return true unless klass.respond_to?('watched_by')", buf
@@ -94,7 +95,7 @@ begin
       end
 
       def test_diff_made_by_revision
-        if @adapter.class.client_version_above?([1, 2])
+        if @diff_c_support
           [16, '16', '4cddb4e45f52'].each do |r1|
             diff1 = @adapter.diff(nil, r1)
             assert_equal 5, diff1.size