scm: subversion: run both of "inline" and "side by side" diff in functional test_directory_diff test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5982 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
cb555d9885
commit
c361ef5a5f
|
@ -264,16 +264,18 @@ class RepositoriesSubversionControllerTest < ActionController::TestCase
|
|||
def test_directory_diff
|
||||
@repository.fetch_changesets
|
||||
@repository.reload
|
||||
get :diff, :id => PRJ_ID, :rev => 6, :rev_to => 2, :path => ['subversion_test', 'folder']
|
||||
assert_response :success
|
||||
assert_template 'diff'
|
||||
['inline', 'sbs'].each do |dt|
|
||||
get :diff, :id => PRJ_ID, :rev => 6, :rev_to => 2,
|
||||
:path => ['subversion_test', 'folder'], :type => dt
|
||||
assert_response :success
|
||||
assert_template 'diff'
|
||||
|
||||
diff = assigns(:diff)
|
||||
assert_not_nil diff
|
||||
# 2 files modified
|
||||
assert_equal 2, Redmine::UnifiedDiff.new(diff).size
|
||||
|
||||
assert_tag :tag => 'h2', :content => /2:6/
|
||||
diff = assigns(:diff)
|
||||
assert_not_nil diff
|
||||
# 2 files modified
|
||||
assert_equal 2, Redmine::UnifiedDiff.new(diff).size
|
||||
assert_tag :tag => 'h2', :content => /2:6/
|
||||
end
|
||||
end
|
||||
|
||||
def test_annotate
|
||||
|
|
Loading…
Reference in New Issue