diff --git a/test/fixtures/repositories/git_repository.tar.gz b/test/fixtures/repositories/git_repository.tar.gz index f2a629829..9c0cd2371 100644 Binary files a/test/fixtures/repositories/git_repository.tar.gz and b/test/fixtures/repositories/git_repository.tar.gz differ diff --git a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb index 990070fbc..e9049956a 100644 --- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb @@ -65,19 +65,23 @@ begin @adapter.branches.each do |b| brs << b end - assert_equal 5, brs.length - br_issue_8857 = brs[-5] + assert_equal 6, brs.length + br_issue_8857 = brs[0] assert_equal 'issue-8857', br_issue_8857.to_s assert_equal '2a682156a3b6e77a8bf9cd4590e8db757f3c6c78', br_issue_8857.revision assert_equal br_issue_8857.scmid, br_issue_8857.revision - br_latin_1_path = brs[-4] + br_latin_1_path = brs[1] assert_equal 'latin-1-path-encoding', br_latin_1_path.to_s assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', br_latin_1_path.revision assert_equal br_latin_1_path.scmid, br_latin_1_path.revision - br_master = brs[-3] + br_master = brs[2] assert_equal 'master', br_master.to_s assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master.revision assert_equal br_master.scmid, br_master.revision + br_master_20120212 = brs[3] + assert_equal 'master-20120212', br_master_20120212.to_s + assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master_20120212.revision + assert_equal br_master_20120212.scmid, br_master_20120212.revision br_latin_1 = brs[-2] assert_equal 'test-latin-1', br_latin_1.to_s assert_equal '67e7792ce20ccae2e4bb73eed09bb397819c8834', br_latin_1.revision diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb index 81cbe2501..febbd7025 100644 --- a/test/unit/repository_git_test.rb +++ b/test/unit/repository_git_test.rb @@ -24,6 +24,7 @@ class RepositoryGitTest < ActiveSupport::TestCase REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin? NUM_REV = 28 + NUM_HEAD = 6 FELIX_HEX = "Felix Sch\xC3\xA4fer" CHAR_1_HEX = "\xc3\x9c" @@ -87,7 +88,7 @@ class RepositoryGitTest < ActiveSupport::TestCase assert_equal "README", change.path assert_equal "A", change.action - assert_equal 5, @repository.extra_info["heads"].size + assert_equal NUM_HEAD, @repository.extra_info["heads"].size end def test_fetch_changesets_incremental @@ -96,7 +97,7 @@ class RepositoryGitTest < ActiveSupport::TestCase @project.reload assert_equal NUM_REV, @repository.changesets.count extra_info_heads = @repository.extra_info["heads"].dup - assert_equal 5, extra_info_heads.size + assert_equal NUM_HEAD, extra_info_heads.size extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" } assert_equal 4, extra_info_heads.size @@ -124,7 +125,7 @@ class RepositoryGitTest < ActiveSupport::TestCase @repository.fetch_changesets @project.reload assert_equal NUM_REV, @repository.changesets.count - assert_equal 5, @repository.extra_info["heads"].size + assert_equal NUM_HEAD, @repository.extra_info["heads"].size assert @repository.extra_info["heads"].index("83ca5fd546063a3c7dc2e568ba3355661a9e2b2c") end @@ -134,7 +135,7 @@ class RepositoryGitTest < ActiveSupport::TestCase @project.reload assert_equal NUM_REV, @repository.changesets.count extra_info_heads = @repository.extra_info["heads"].dup - assert_equal 5, extra_info_heads.size + assert_equal NUM_HEAD, extra_info_heads.size extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" } assert_equal 4, extra_info_heads.size @@ -247,7 +248,7 @@ class RepositoryGitTest < ActiveSupport::TestCase @repository.fetch_changesets @project.reload assert_equal NUM_REV, @repository.changesets.count - assert_equal 5, @repository.extra_info["heads"].size + assert_equal NUM_HEAD, @repository.extra_info["heads"].size assert_equal 0, @repository.extra_info["db_consistent"]["ordering"] end