summaryrefslogtreecommitdiffstats
path: root/test/functional/repositories_mercurial_controller_test.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-09-19 02:29:11 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-09-19 02:29:11 +0000
commitf18edc4e1c045b968cba8d8f905257e63a1c0d5c (patch)
tree0fb429acc0473de1df9cdf022da995f8aaa25d88 /test/functional/repositories_mercurial_controller_test.rb
parent0af04b8ae031398adbeebf5536f934d3c1ba9148 (diff)
downloadredmine-f18edc4e1c045b968cba8d8f905257e63a1c0d5c.tar.gz
redmine-f18edc4e1c045b968cba8d8f905257e63a1c0d5c.zip
use git diff format for all diff (#11868)
Mercurial diff uses git format. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10428 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/repositories_mercurial_controller_test.rb')
-rw-r--r--test/functional/repositories_mercurial_controller_test.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index bfcf2d669..d4cefbd22 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -371,6 +371,20 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
end
end
+ def test_diff_should_show_modified_filenames
+ get :diff, :id => PRJ_ID, :rev => '400bb8672109', :type => 'inline'
+ assert_response :success
+ assert_template 'diff'
+ assert_select 'th.filename', :text => 'sources/watchers_controller.rb'
+ end
+
+ def test_diff_should_show_deleted_filenames
+ get :diff, :id => PRJ_ID, :rev => 'b3a615152df8', :type => 'inline'
+ assert_response :success
+ assert_template 'diff'
+ assert_select 'th.filename', :text => 'sources/welcome_controller.rb'
+ end
+
def test_annotate
get :annotate, :id => PRJ_ID,
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]