From 2558ad084523c4374f6e89fe0d466d973af9014b 2012-09-01 07:26:15
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: 2012-09-01 07:26:15
Subject: [PATCH] Merged r10252 from trunk to 2.0-stable (#11752)

scm: git: use with_settings at test_diff_truncated of functional test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@10274 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 1074e54..630c8be 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -326,13 +326,13 @@ class RepositoriesGitControllerTest < ActionController::TestCase
               :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
           assert_response :success
           assert @response.body.include?("... This diff was truncated")
-  
-          Setting.default_language = 'fr'
-          get :diff, :id   => PRJ_ID, :type => 'inline',
-              :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
-          assert_response :success
-          assert ! @response.body.include?("... This diff was truncated")
-          assert @response.body.include?("... Ce diff")
+          with_settings :default_language => 'fr' do
+            get :diff, :id   => PRJ_ID, :type => 'inline',
+                :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
+            assert_response :success
+            assert ! @response.body.include?("... This diff was truncated")
+            assert @response.body.include?("... Ce diff")
+          end
         end
       end
     end