summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-09-01 02:23:44 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-09-01 02:23:44 +0000
commit43add0d306747c5d9a6f0ea36e684103a4aa9d26 (patch)
tree33ff2812ce19635577475896dd039d92ad378d04
parent3581782ec2a46ca19058b4189ce6fcc8d62bc145 (diff)
downloadredmine-43add0d306747c5d9a6f0ea36e684103a4aa9d26.tar.gz
redmine-43add0d306747c5d9a6f0ea36e684103a4aa9d26.zip
scm: git: use with_settings at test_diff_truncated of functional test (#11752)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10252 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/functional/repositories_git_controller_test.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 795a35af2..38a2d5b1e 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -324,13 +324,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