From ce67da88c40972c125b5ba47f590cff551a3de60 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 4 Feb 2012 08:26:00 +0000 Subject: [PATCH] Merged r8760 from trunk scm: git: add test that diff type is saved in user preference. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8762 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../repositories_git_controller_test.rb | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index 0a95cbeef..8c7162d38 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -308,6 +308,26 @@ class RepositoriesGitControllerTest < ActionController::TestCase end end + def test_save_diff_type + @request.session[:user_id] = 1 # admin + user = User.find(1) + get :diff, + :id => PRJ_ID, + :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7' + assert_response :success + assert_template 'diff' + user.reload + assert_equal "inline", user.pref[:diff_type] + get :diff, + :id => PRJ_ID, + :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7', + :type => 'sbs' + assert_response :success + assert_template 'diff' + user.reload + assert_equal "sbs", user.pref[:diff_type] + end + def test_annotate get :annotate, :id => PRJ_ID, :path => ['sources', 'watchers_controller.rb'] assert_response :success