diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-06-01 04:16:08 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-06-01 04:16:08 +0000 |
| commit | cb460ada33177a5ee47ce2dffee27563d757e586 (patch) | |
| tree | f43c957301ced22bf857e3a7f566100c4d538b16 /test/functional/repositories_git_controller_test.rb | |
| parent | ab75fb1c82897214c4cae41e571323dc4ae7a4d6 (diff) | |
| download | redmine-cb460ada33177a5ee47ce2dffee27563d757e586.tar.gz redmine-cb460ada33177a5ee47ce2dffee27563d757e586.zip | |
scm: git: run both "inline" and "side by side" diff in functional test_diff_two_revs test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5973 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/repositories_git_controller_test.rb')
| -rw-r--r-- | test/functional/repositories_git_controller_test.rb | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index 38675af60..404e3de50 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -212,14 +212,18 @@ class RepositoriesGitControllerTest < ActionController::TestCase def test_diff_two_revs @repository.fetch_changesets @repository.reload - get :diff, :id => PRJ_ID, - :rev => '61b685fbe55ab05b5ac68402d5720c1a6ac973d1', - :rev_to => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7' - assert_response :success - assert_template 'diff' - diff = assigns(:diff) - assert_not_nil diff - assert_tag :tag => 'h2', :content => /2f9c0091:61b685fb/ + ['inline', 'sbs'].each do |dt| + get :diff, + :id => PRJ_ID, + :rev => '61b685fbe55ab05b5ac68402d5720c1a6ac973d1', + :rev_to => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7', + :type => dt + assert_response :success + assert_template 'diff' + diff = assigns(:diff) + assert_not_nil diff + assert_tag :tag => 'h2', :content => /2f9c0091:61b685fb/ + end end def test_diff_latin_1 |