Merged r10501 from trunk

set user preference diff type nil at functional tests.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10505 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-09-28 03:54:07 +00:00
parent 2d34ab9235
commit f27a0eca5b
2 changed files with 12 additions and 2 deletions

View File

@ -96,8 +96,13 @@ class AttachmentsControllerTest < ActionController::TestCase
end
def test_save_diff_type
@request.session[:user_id] = 1 # admin
user1 = User.find(1)
user1.pref[:diff_type] = nil
user1.preference.save
user = User.find(1)
assert_nil user.pref[:diff_type]
@request.session[:user_id] = 1 # admin
get :show, :id => 5
assert_response :success
assert_template 'diff'

View File

@ -385,8 +385,13 @@ class RepositoriesGitControllerTest < ActionController::TestCase
end
def test_save_diff_type
@request.session[:user_id] = 1 # admin
user1 = User.find(1)
user1.pref[:diff_type] = nil
user1.preference.save
user = User.find(1)
assert_nil user.pref[:diff_type]
@request.session[:user_id] = 1 # admin
get :diff,
:id => PRJ_ID,
:rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'