From 41667cd5deeffaccf83141b12d25872ccabb1ea1 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 26 Feb 2014 13:01:43 +0000 Subject: [PATCH] Merged r12929 from trunk to 2.5-stable (#16177) scm: mercurial: add one "closed" branch to test repository. git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12931 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../repositories/mercurial_repository.hg | Bin 11046 -> 11213 bytes .../repositories_mercurial_controller_test.rb | 2 +- .../scm/adapters/mercurial_adapter_test.rb | 4 ++-- test/unit/repository_mercurial_test.rb | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/fixtures/repositories/mercurial_repository.hg b/test/fixtures/repositories/mercurial_repository.hg index 0b621e724a4844cea74393a2cd71e54254072897..751f44f99e6c8c8d350c2e744c87da6c94b7d92e 100644 GIT binary patch literal 11213 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 literal 11046 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 WR#CO4t$zpC3YF-1_)a~4O#crMC$5?R diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb index 6b1231f07..8eec4f3de 100644 --- a/test/functional/repositories_mercurial_controller_test.rb +++ b/test/functional/repositories_mercurial_controller_test.rb @@ -26,7 +26,7 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s CHAR_1_HEX = "\xc3\x9c" PRJ_ID = 3 - NUM_REV = 32 + NUM_REV = 34 ruby19_non_utf8_pass = (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8') 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 40db389cb..7f062d1f1 100644 --- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb @@ -89,8 +89,8 @@ begin adp = Redmine::Scm::Adapters::MercurialAdapter.new(repo) repo_path = adp.info.root_url.gsub(/\\/, "/") assert_equal REPOSITORY_PATH, repo_path - assert_equal '31', adp.info.lastrev.revision - assert_equal '31eeee7395c8c78e66dd54c50addd078d10b2355',adp.info.lastrev.scmid + assert_equal '33', adp.info.lastrev.revision + assert_equal '2e6d546429230f377d7d19c2078abd2dd909f235',adp.info.lastrev.scmid end end diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb index 953986edb..9762e47a9 100644 --- a/test/unit/repository_mercurial_test.rb +++ b/test/unit/repository_mercurial_test.rb @@ -23,7 +23,7 @@ class RepositoryMercurialTest < ActiveSupport::TestCase include Redmine::I18n REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s - NUM_REV = 32 + NUM_REV = 34 CHAR_1_HEX = "\xc3\x9c" def setup @@ -263,7 +263,7 @@ class RepositoryMercurialTest < ActiveSupport::TestCase # with_limit changesets = @repository.latest_changesets('', nil, 2) - assert_equal %w|31 30|, changesets.collect(&:revision) + assert_equal ["#{NUM_REV - 1}", "#{NUM_REV - 2}"], changesets.collect(&:revision) # with_filepath changesets = @repository.latest_changesets( @@ -600,7 +600,7 @@ class RepositoryMercurialTest < ActiveSupport::TestCase @repository.fetch_changesets @project.reload assert_equal NUM_REV, @repository.changesets.count - %w|31 31eeee7395c8 31eee|.each do |r1| + ["#{NUM_REV - 1}", "2e6d54642923", "2e6d5"].each do |r1| changeset = @repository.find_changeset_by_name(r1) assert_nil changeset.next end -- 2.39.5