##// END OF EJS Templates
Merged r10498 from trunk...
Toshi MARUYAMA -
r10291:59d4d210a76b
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
@@ -322,10 +320,12 class RepositoriesGitControllerTest < ActionController::TestCase
322 with_settings :diff_max_lines_displayed => 5 do
320 with_settings :diff_max_lines_displayed => 5 do
323 # Truncated diff of changeset 2f9c0091
321 # Truncated diff of changeset 2f9c0091
324 with_cache do
322 with_cache do
323 with_settings :default_language => 'en' do
325 get :diff, :id => PRJ_ID, :type => 'inline',
324 get :diff, :id => PRJ_ID, :type => 'inline',
326 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
325 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
327 assert_response :success
326 assert_response :success
328 assert @response.body.include?("... This diff was truncated")
327 assert @response.body.include?("... This diff was truncated")
328 end
329 with_settings :default_language => 'fr' do
329 with_settings :default_language => 'fr' do
330 get :diff, :id => PRJ_ID, :type => 'inline',
330 get :diff, :id => PRJ_ID, :type => 'inline',
331 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
331 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
General Comments 0
You need to be logged in to leave comments. Login now