Skip to content

Commit

Permalink
scm: mercurial: run both of "inline" and "side by side" diff in funct…
Browse files Browse the repository at this point in the history
…ional test_diff_latin_1_path test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5985 e93f8b46-1217-0410-a6f0-8f06a7374b81
  • Loading branch information
marutosi committed Jun 1, 2011
1 parent 45cce00 commit 901a937
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions test/functional/repositories_mercurial_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -302,23 +302,25 @@ def test_diff_two_revs
def test_diff_latin_1_path
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
[21, 'adf805632193'].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}-2.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 => /It is written in Python/
:tag => 'th',
:attributes => { :class => 'filename' } ,
:content => /latin-1-dir\/test-#{@char_1}-2.txt/ ,
},
:sibling => {
:tag => 'tbody',
:descendant => {
:tag => 'td',
:attributes => { :class => /diff_in/ },
:content => /It is written in Python/
}
}
}
end
end
end
end
Expand Down

0 comments on commit 901a937

Please sign in to comment.