From cb460ada33177a5ee47ce2dffee27563d757e586 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 1 Jun 2011 04:16:08 +0000
Subject: [PATCH] scm: git: run both "inline" and "side by side" diff in
 functional test_diff_two_revs test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5973 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .../repositories_git_controller_test.rb       | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 38675af60..404e3de50 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -212,14 +212,18 @@ class RepositoriesGitControllerTest < ActionController::TestCase
     def test_diff_two_revs
       @repository.fetch_changesets
       @repository.reload
-      get :diff, :id => PRJ_ID,
-          :rev    => '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
-          :rev_to => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
-      assert_response :success
-      assert_template 'diff'
-      diff = assigns(:diff)
-      assert_not_nil diff
-      assert_tag :tag => 'h2', :content => /2f9c0091:61b685fb/
+      ['inline', 'sbs'].each do |dt|
+        get :diff,
+            :id     => PRJ_ID,
+            :rev    => '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
+            :rev_to => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
+            :type   => dt
+        assert_response :success
+        assert_template 'diff'
+        diff = assigns(:diff)
+        assert_not_nil diff
+        assert_tag :tag => 'h2', :content => /2f9c0091:61b685fb/
+      end
     end
 
     def test_diff_latin_1
-- 
2.39.5