##// END OF EJS Templates
scm: git: use with_settings instead of assigned setting at functional test...
Toshi MARUYAMA -
r10289:1efd303b4aa0
parent child
Show More
@@ -53,8 +53,6 class RepositoriesGitControllerTest < ActionController::TestCase
53 if @char_1.respond_to?(:force_encoding)
53 if @char_1.respond_to?(:force_encoding)
54 @char_1.force_encoding('UTF-8')
54 @char_1.force_encoding('UTF-8')
55 end
55 end
56
57 Setting.default_language = 'en'
58 end
56 end
59
57
60 def test_create_and_update
58 def test_create_and_update
@@ -320,10 +318,12 class RepositoriesGitControllerTest < ActionController::TestCase
320 with_settings :diff_max_lines_displayed => 5 do
318 with_settings :diff_max_lines_displayed => 5 do
321 # Truncated diff of changeset 2f9c0091
319 # Truncated diff of changeset 2f9c0091
322 with_cache do
320 with_cache do
323 get :diff, :id => PRJ_ID, :type => 'inline',
321 with_settings :default_language => 'en' do
324 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
322 get :diff, :id => PRJ_ID, :type => 'inline',
325 assert_response :success
323 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
326 assert @response.body.include?("... This diff was truncated")
324 assert_response :success
325 assert @response.body.include?("... This diff was truncated")
326 end
327 with_settings :default_language => 'fr' do
327 with_settings :default_language => 'fr' do
328 get :diff, :id => PRJ_ID, :type => 'inline',
328 get :diff, :id => PRJ_ID, :type => 'inline',
329 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
329 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
General Comments 0
You need to be logged in to leave comments. Login now