diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-06-01 06:12:34 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-06-01 06:12:34 +0000 |
| commit | c361ef5a5f9816c5b4f9a0f6080fefd57e784113 (patch) | |
| tree | 03b9889639b8073a630d0e3d1a28812b75714e4e | |
| parent | cb555d98850571398550c5b568818dfe4087eb01 (diff) | |
| download | redmine-c361ef5a5f9816c5b4f9a0f6080fefd57e784113.tar.gz redmine-c361ef5a5f9816c5b4f9a0f6080fefd57e784113.zip | |
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
| -rw-r--r-- | test/functional/repositories_subversion_controller_test.rb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb index 104b12d18..e6d4fbe7b 100644 --- a/test/functional/repositories_subversion_controller_test.rb +++ b/test/functional/repositories_subversion_controller_test.rb @@ -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' - - diff = assigns(:diff) - assert_not_nil diff - # 2 files modified - assert_equal 2, Redmine::UnifiedDiff.new(diff).size + ['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' - 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 |