summaryrefslogtreecommitdiffstats
path: root/test/functional
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-01-09 01:30:18 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-01-09 01:30:18 +0000
commitef28bf6d88f66e2a61bb14169671cc8fbb8086e0 (patch)
tree4e7e182646ec4e1a3f7cb79f76a383f5656185f8 /test/functional
parent5207211b6d02dd36a8aa3e691d125a03137cdf2e (diff)
downloadredmine-ef28bf6d88f66e2a61bb14169671cc8fbb8086e0.tar.gz
redmine-ef28bf6d88f66e2a61bb14169671cc8fbb8086e0.zip
scm: mercurial: annotate accepts both of revision number and changeset id (#3724).
Change annotate revision label to Mercurial style '4:def6d2f1254a' and use identifier. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4663 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/repositories_mercurial_controller_test.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index b577da87e..41f5462fd 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -134,7 +134,7 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
:attributes => { :class => /diff_out/ },
:content => /def remove/ }
end
-
+
def test_annotate
get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
assert_response :success
@@ -147,8 +147,7 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
{
:tag => 'td',
:attributes => { :class => 'revision' },
- :child => { :tag => 'a', :content => '4' }
- # :child => { :tag => 'a', :content => /4:def6d2f1/ }
+ :child => { :tag => 'a', :content => '4:def6d2f1254a' }
}
assert_tag :tag => 'th',
:content => '23',