From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 1 Jun 2011 07:45:48 +0000 (+0000)
Subject: scm: mercurial: run both of "inline" and "side by side" diff in functional test_diff... 
X-Git-Tag: 1.3.0~1881
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bc8b1c0b22d2912221980e5df9ba426041a9d971;p=redmine.git

scm: mercurial: run both of "inline" and "side by side" diff in functional test_diff test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5983 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index e521631c7..7451fb56f 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -260,17 +260,19 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
       @repository.reload
       [4, '4', 'def6d2f1254a'].each do |r1|
         # Full diff of changeset 4
-        get :diff, :id => PRJ_ID, :rev => r1
-        assert_response :success
-        assert_template 'diff'
-        if @diff_c_support
-          # Line 22 removed
-          assert_tag :tag => 'th',
-                     :content => '22',
-                     :sibling => { :tag => 'td',
-                                   :attributes => { :class => /diff_out/ },
-                                   :content => /def remove/ }
-          assert_tag :tag => 'h2', :content => /4:def6d2f1254a/
+        ['inline', 'sbs'].each do |dt|
+          get :diff, :id => PRJ_ID, :rev => r1, :type => dt
+          assert_response :success
+          assert_template 'diff'
+          if @diff_c_support
+            # Line 22 removed
+            assert_tag :tag => 'th',
+                       :content => '22',
+                       :sibling => { :tag => 'td',
+                                     :attributes => { :class => /diff_out/ },
+                                     :content => /def remove/ }
+            assert_tag :tag => 'h2', :content => /4:def6d2f1254a/
+          end
         end
       end
     end