diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-06-01 04:16:28 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-06-01 04:16:28 +0000 |
| commit | 41a439d052b739823c6af044e7b4bfaa03ac9f4e (patch) | |
| tree | 71d88ea7605b787a6d76f76ea6151afda06d27aa | |
| parent | cb460ada33177a5ee47ce2dffee27563d757e586 (diff) | |
| download | redmine-41a439d052b739823c6af044e7b4bfaa03ac9f4e.tar.gz redmine-41a439d052b739823c6af044e7b4bfaa03ac9f4e.zip | |
scm: git: run both "inline" and "side by side" diff in functional test_diff_latin_1 test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5974 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | test/functional/repositories_git_controller_test.rb | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index 404e3de50..87925449c 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -232,23 +232,25 @@ class RepositoriesGitControllerTest < ActionController::TestCase else with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1| - get :diff, :id => PRJ_ID, :rev => r1 - assert_response :success - assert_template 'diff' - assert_tag :tag => 'thead', - :descendant => { - :tag => 'th', - :attributes => { :class => 'filename' } , - :content => /latin-1-dir\/test-#{@char_1}.txt/ , - }, - :sibling => { - :tag => 'tbody', + ['inline', 'sbs'].each do |dt| + get :diff, :id => PRJ_ID, :rev => r1, :type => dt + assert_response :success + assert_template 'diff' + assert_tag :tag => 'thead', :descendant => { - :tag => 'td', - :attributes => { :class => /diff_in/ }, - :content => /test-#{@char_1}.txt/ + :tag => 'th', + :attributes => { :class => 'filename' } , + :content => /latin-1-dir\/test-#{@char_1}.txt/ , + }, + :sibling => { + :tag => 'tbody', + :descendant => { + :tag => 'td', + :attributes => { :class => /diff_in/ }, + :content => /test-#{@char_1}.txt/ + } } - } + end end end end |