From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 28 Sep 2012 02:02:30 +0000 (+0000)
Subject: set user preference diff type nil at functional tests
X-Git-Tag: 2.2.0~326
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=086478c5a6fca09c6a7fd8b7765b521f542cf0b9;p=redmine.git

set user preference diff type nil at functional tests

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10501 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index bc37c3181..8c0375d6d 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 873b3e284..dc82f7c73 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -395,8 +395,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'