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

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

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

diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index 698c33d07..23c3b71bf 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -302,23 +302,25 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
     def test_diff_latin_1_path
       with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
         [21, 'adf805632193'].each do |r1|
-          get :diff, :id => PRJ_ID, :rev => r1
-          assert_response :success
-          assert_template 'diff'
-          assert_tag :tag => 'thead',
-                     :descendant => {
-                       :tag => 'th',
-                       :attributes => { :class => 'filename' } ,
-                       :content => /latin-1-dir\/test-#{@char_1}-2.txt/ ,
-                      },
-                     :sibling => {
-                       :tag => 'tbody',
+          ['inline', 'sbs'].each do |dt|
+            get :diff, :id => PRJ_ID, :rev => r1, :type => dt
+            assert_response :success
+            assert_template 'diff'
+            assert_tag :tag => 'thead',
                        :descendant => {
-                          :tag => 'td',
-                          :attributes => { :class => /diff_in/ },
-                          :content => /It is written in Python/
+                         :tag => 'th',
+                         :attributes => { :class => 'filename' } ,
+                         :content => /latin-1-dir\/test-#{@char_1}-2.txt/ ,
+                        },
+                       :sibling => {
+                         :tag => 'tbody',
+                         :descendant => {
+                            :tag => 'td',
+                            :attributes => { :class => /diff_in/ },
+                            :content => /It is written in Python/
+                         }
                        }
-                     }
+          end
         end
       end
     end