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
This commit is contained in:
parent
cb460ada33
commit
41a439d052
|
@ -232,23 +232,25 @@ class RepositoriesGitControllerTest < ActionController::TestCase
|
||||||
else
|
else
|
||||||
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
|
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
|
||||||
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
|
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
|
||||||
get :diff, :id => PRJ_ID, :rev => r1
|
['inline', 'sbs'].each do |dt|
|
||||||
assert_response :success
|
get :diff, :id => PRJ_ID, :rev => r1, :type => dt
|
||||||
assert_template 'diff'
|
assert_response :success
|
||||||
assert_tag :tag => 'thead',
|
assert_template 'diff'
|
||||||
:descendant => {
|
assert_tag :tag => 'thead',
|
||||||
:tag => 'th',
|
|
||||||
:attributes => { :class => 'filename' } ,
|
|
||||||
:content => /latin-1-dir\/test-#{@char_1}.txt/ ,
|
|
||||||
},
|
|
||||||
:sibling => {
|
|
||||||
:tag => 'tbody',
|
|
||||||
:descendant => {
|
:descendant => {
|
||||||
:tag => 'td',
|
:tag => 'th',
|
||||||
:attributes => { :class => /diff_in/ },
|
:attributes => { :class => 'filename' } ,
|
||||||
:content => /test-#{@char_1}.txt/
|
: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
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue