From f27a0eca5b140e3d06dccf621ac1df29594b4d32 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 28 Sep 2012 03:54:07 +0000 Subject: [PATCH] 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 --- test/functional/attachments_controller_test.rb | 7 ++++++- test/functional/repositories_git_controller_test.rb | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb index 11c3faa95..0aed2395c 100644 --- a/test/functional/attachments_controller_test.rb +++ b/test/functional/attachments_controller_test.rb @@ -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' diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index e8eb69f18..a3ecc09a7 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -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'