##// END OF EJS Templates
Merged r10501 from trunk...
Toshi MARUYAMA -
r10296:f27a0eca5b14
parent child
Show More
@@ -96,8 +96,13 class AttachmentsControllerTest < ActionController::TestCase
96 end
96 end
97
97
98 def test_save_diff_type
98 def test_save_diff_type
99 @request.session[:user_id] = 1 # admin
99 user1 = User.find(1)
100 user1.pref[:diff_type] = nil
101 user1.preference.save
100 user = User.find(1)
102 user = User.find(1)
103 assert_nil user.pref[:diff_type]
104
105 @request.session[:user_id] = 1 # admin
101 get :show, :id => 5
106 get :show, :id => 5
102 assert_response :success
107 assert_response :success
103 assert_template 'diff'
108 assert_template 'diff'
@@ -385,8 +385,13 class RepositoriesGitControllerTest < ActionController::TestCase
385 end
385 end
386
386
387 def test_save_diff_type
387 def test_save_diff_type
388 @request.session[:user_id] = 1 # admin
388 user1 = User.find(1)
389 user1.pref[:diff_type] = nil
390 user1.preference.save
389 user = User.find(1)
391 user = User.find(1)
392 assert_nil user.pref[:diff_type]
393
394 @request.session[:user_id] = 1 # admin
390 get :diff,
395 get :diff,
391 :id => PRJ_ID,
396 :id => PRJ_ID,
392 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
397 :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
General Comments 0
You need to be logged in to leave comments. Login now