diff options
| -rw-r--r-- | test/functional/repositories_mercurial_controller_test.rb | 3 | ||||
| -rw-r--r-- | test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb index ae7f4226e..219082828 100644 --- 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 dd8492725..e38c31ab1 100644 --- 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 |