1
0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00

Merged r10252 from trunk to 2.0-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/2.0-stable@10274 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-09-01 07:26:15 +00:00
parent 08ce7df5ea
commit 2558ad0845

View File

@ -326,8 +326,7 @@ class RepositoriesGitControllerTest < ActionController::TestCase
: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")
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
@ -336,6 +335,7 @@ class RepositoriesGitControllerTest < ActionController::TestCase
end end
end end
end end
end
def test_diff_two_revs def test_diff_two_revs
assert_equal 0, @repository.changesets.count assert_equal 0, @repository.changesets.count