diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-02-26 13:05:45 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-02-26 13:05:45 +0000 |
| commit | 5e031bce4703355222397c8df5ffe683c2d6a237 (patch) | |
| tree | 13247c9ab8ba8839fc864f058d08b326faef01b6 | |
| parent | dc431edbc8e34e63466aee3a0250628bdfc6d8e2 (diff) | |
| download | redmine-5e031bce4703355222397c8df5ffe683c2d6a237.tar.gz redmine-5e031bce4703355222397c8df5ffe683c2d6a237.zip | |
Merged r12929 from trunk to 2.4-stable (#16177)
scm: mercurial: add one "closed" branch to test repository.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12933 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | test/fixtures/repositories/mercurial_repository.hg | bin | 11046 -> 11213 bytes | |||
| -rw-r--r-- | test/functional/repositories_mercurial_controller_test.rb | 2 | ||||
| -rw-r--r-- | test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb | 4 | ||||
| -rw-r--r-- | 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 Binary files differindex 0b621e724..751f44f99 100644 --- a/test/fixtures/repositories/mercurial_repository.hg +++ b/test/fixtures/repositories/mercurial_repository.hg 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 67c7745b8..e10da1061 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 '31eeee7395c8',adp.info.lastrev.scmid + assert_equal '33', adp.info.lastrev.revision + assert_equal '2e6d54642923',adp.info.lastrev.scmid end end diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb index e10c05b48..6936dc505 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 @@ -144,7 +144,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( @@ -365,7 +365,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 |