From 3e2a67be4feacd70d1fa7fae96d8c2b0d9f85102 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 12 May 2011 13:01:10 +0000 Subject: [PATCH] scm: git: add another revision in merged revisions test in unit adapter test (#7146). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5761 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../lib/redmine/scm/adapters/git_adapter_test.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 d91f41871..8274e8b1d 100644 --- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb @@ -118,6 +118,18 @@ begin # Merged revision assert_equal '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf', revs1[ 3].identifier assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[-1].identifier + + revs2 = @adapter.revisions('', + "fba357b886984ee71185ad2065e65fc0417d9b92", + "master", + {:reverse => true}) + assert_equal 7, revs2.length + assert_equal '7e61ac704deecde634b51e59daa8110435dcb3da', revs2[ 0].identifier + # 4a07fe31b is not a child of fba357b8869 + assert_equal '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8', revs2[ 1].identifier + # Merged revision + assert_equal '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf', revs2[ 2].identifier + assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs2[-1].identifier end def test_revisions_branch_latin_1_path_encoding_all