diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/repositories/git_repository.tar.gz | bin | 21021 -> 21068 bytes | |||
| -rw-r--r-- | test/unit/lib/redmine/scm/adapters/git_adapter_test.rb | 18 | ||||
| -rw-r--r-- | test/unit/repository_git_test.rb | 2 |
3 files changed, 15 insertions, 5 deletions
diff --git a/test/fixtures/repositories/git_repository.tar.gz b/test/fixtures/repositories/git_repository.tar.gz Binary files differindex 9c0cd2371..ce1671caa 100644 --- a/test/fixtures/repositories/git_repository.tar.gz +++ b/test/fixtures/repositories/git_repository.tar.gz 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 589a52807..98dbbe35c 100644 --- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb @@ -75,23 +75,33 @@ class GitAdapterTest < ActiveSupport::TestCase @adapter.branches.each do |b| brs << b end - assert_equal 6, brs.length + assert_equal 8, 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 assert_equal false, br_issue_8857.is_default - br_latin_1_path = brs[1] + br_latin_1_branch1 = brs[1] + assert_equal "latin-1-branch-#{@char_1}-01", br_latin_1_branch1.to_s + assert_equal '4fc55c43bf3d3dc2efb66145365ddc17639ce81e', br_latin_1_branch1.revision + assert_equal br_latin_1_branch1.scmid, br_latin_1_branch1.revision + assert_equal false, br_latin_1_branch1.is_default + br_latin_1_branch2 = brs[2] + assert_equal "latin-1-branch-#{@char_1}-02", br_latin_1_branch2.to_s + assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', br_latin_1_branch2.revision + assert_equal br_latin_1_branch2.scmid, br_latin_1_branch2.revision + assert_equal false, br_latin_1_branch2.is_default + br_latin_1_path = brs[3] 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 assert_equal false, br_latin_1_path.is_default - br_master = brs[2] + br_master = brs[4] assert_equal 'master', br_master.to_s assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master.revision assert_equal br_master.scmid, br_master.revision assert_equal false, br_master.is_default - br_master_20120212 = brs[3] + br_master_20120212 = brs[5] 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 diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb index 6b228dc36..1c2c55064 100644 --- a/test/unit/repository_git_test.rb +++ b/test/unit/repository_git_test.rb @@ -28,7 +28,7 @@ class RepositoryGitTest < ActiveSupport::TestCase REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin? NUM_REV = 28 - NUM_HEAD = 6 + NUM_HEAD = 8 ## Git, Mercurial and CVS path encodings are binary. ## Subversion supports URL encoding for path. |