]> source.dussan.org Git - redmine.git/commitdiff
scm: subversion: run both of "inline" and "side by side" diff in functional test_dire...
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 1 Jun 2011 06:12:34 +0000 (06:12 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 1 Jun 2011 06:12:34 +0000 (06:12 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5982 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/functional/repositories_subversion_controller_test.rb

index 104b12d181f38ebe65595be5ca0046f3c81eb41f..e6d4fbe7bffb117dcc94e53b7823fa091e3a4a8e 100644 (file)
@@ -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