Merged r10501 from trunk

set user preference diff type nil at functional tests. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10504 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-28 03:51:33 +00:00
parent 59d4d210a7
commit d69cae859f
2 changed files with 12 additions and 2 deletions
@@ -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'