diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-06-01 07:46:35 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-06-01 07:46:35 +0000 |
| commit | 45cce005d20cd34744d4791a7caeff2a22d462e9 (patch) | |
| tree | 6f1e319e054a0dd68d38d45842b4adb2a2371986 /test/functional/repositories_mercurial_controller_test.rb | |
| parent | bc8b1c0b22d2912221980e5df9ba426041a9d971 (diff) | |
| download | redmine-45cce005d20cd34744d4791a7caeff2a22d462e9.tar.gz redmine-45cce005d20cd34744d4791a7caeff2a22d462e9.zip | |
scm: mercurial: run both of "inline" and "side by side" diff in functional test_diff_two_revs test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5984 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/repositories_mercurial_controller_test.rb')
| -rw-r--r-- | test/functional/repositories_mercurial_controller_test.rb | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb index 7451fb56f..698c33d07 100644 --- a/test/functional/repositories_mercurial_controller_test.rb +++ b/test/functional/repositories_mercurial_controller_test.rb @@ -282,14 +282,19 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase @repository.reload [2, '400bb8672109', '400', 400].each do |r1| [4, 'def6d2f1254a'].each do |r2| - get :diff, :id => PRJ_ID, :rev => r1, - :rev_to => r2 - assert_response :success - assert_template 'diff' - - diff = assigns(:diff) - assert_not_nil diff - assert_tag :tag => 'h2', :content => /4:def6d2f1254a 2:400bb8672109/ + ['inline', 'sbs'].each do |dt| + get :diff, + :id => PRJ_ID, + :rev => r1, + :rev_to => r2, + :type => dt + assert_response :success + assert_template 'diff' + diff = assigns(:diff) + assert_not_nil diff + assert_tag :tag => 'h2', + :content => /4:def6d2f1254a 2:400bb8672109/ + end end end end |