From 2d34ab923561a464aac318a2cb72daf6864819c2 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 28 Sep 2012 00:17:59 +0000 Subject: [PATCH] Merged r10498 from trunk scm: git: use with_settings instead of assigned setting at functional test git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10499 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/repositories_git_controller_test.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index 38a2d5b1e..e8eb69f18 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -53,8 +53,6 @@ class RepositoriesGitControllerTest < ActionController::TestCase if @char_1.respond_to?(:force_encoding) @char_1.force_encoding('UTF-8') end - - Setting.default_language = 'en' end def test_create_and_update @@ -320,10 +318,12 @@ class RepositoriesGitControllerTest < ActionController::TestCase with_settings :diff_max_lines_displayed => 5 do # Truncated diff of changeset 2f9c0091 with_cache do - get :diff, :id => PRJ_ID, :type => 'inline', - :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7' - assert_response :success - assert @response.body.include?("... This diff was truncated") + with_settings :default_language => 'en' do + get :diff, :id => PRJ_ID, :type => 'inline', + :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7' + assert_response :success + assert @response.body.include?("... This diff was truncated") + end with_settings :default_language => 'fr' do get :diff, :id => PRJ_ID, :type => 'inline', :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7' -- 2.39.5