Merged r10252 from trunk to 1.4-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/1.4-stable@10259 e93f8b46-1217-0410-a6f0-8f06a7374b81

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")
-  
+          with_settings :default_language => 'fr' do
-          Setting.default_language = 'fr'
+            get :diff, :id   => PRJ_ID, :type => 'inline',
-          get :diff, :id   => PRJ_ID, :type => 'inline',
+                :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
-              :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
+            assert_response :success
-          assert_response :success
+            assert ! @response.body.include?("... This diff was truncated")
-          assert ! @response.body.include?("... This diff was truncated")
+            assert @response.body.include?("... Ce diff")
-          assert @response.body.include?("... Ce diff")
+          end
         end
       end
     end