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

test/functional/repositories_git_controller_test.rb

index 06af9cd47c143de0fa6264eeb99a2bf3783aac67..38675af6063182af0a111ea13db38cba7f2e5221 100644 (file)
@@ -192,16 +192,21 @@ class RepositoriesGitControllerTest < ActionController::TestCase
       @repository.fetch_changesets
       @repository.reload
       # Full diff of changeset 2f9c0091
-      get :diff, :id => PRJ_ID, :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
-      assert_response :success
-      assert_template 'diff'
-      # Line 22 removed
-      assert_tag :tag => 'th',
-                 :content => /22/,
-                 :sibling => { :tag => 'td',
-                               :attributes => { :class => /diff_out/ },
-                               :content => /def remove/ }
-      assert_tag :tag => 'h2', :content => /2f9c0091/
+      ['inline', 'sbs'].each do |dt|
+        get :diff,
+            :id   => PRJ_ID,
+            :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
+            :type => dt
+        assert_response :success
+        assert_template 'diff'
+        # Line 22 removed
+        assert_tag :tag => 'th',
+                   :content => /22/,
+                   :sibling => { :tag => 'td',
+                                 :attributes => { :class => /diff_out/ },
+                                 :content => /def remove/ }
+        assert_tag :tag => 'h2', :content => /2f9c0091/
+      end
     end
 
     def test_diff_two_revs