##// END OF EJS Templates
jro_apps » redmine
RSS
Pass parameters with :params in controller tests....
Jean-Philippe Lang -
r15282:c364e6ee9b2e
parent child
Show More
Side by Side Unified
Context file:
r15282:c364e6ee9b2e Loading diff...:
Show file before | Show file after | Hide comments
@@ -42,7 +42,7 class UsersControllerTest < Redmine::ControllerTest
42 end
42 end
43
43
44 def test_index_with_status_filter
44 def test_index_with_status_filter
45 get :index, :status => 3
45 get :index, :params => {:status => 3}
46 assert_response :success
46 assert_response :success
47 assert_template 'index'
47 assert_template 'index'
48 assert_not_nil assigns(:users)
48 assert_not_nil assigns(:users)
@@ -50,7 +50,7 class UsersControllerTest < Redmine::ControllerTest
50 end
50 end
51
51
52 def test_index_with_name_filter
52 def test_index_with_name_filter
53 get :index, :name => 'john'
53 get :index, :params => {:name => 'john'}
54 assert_response :success
54 assert_response :success
55 assert_template 'index'
55 assert_template 'index'
56 users = assigns(:users)
56 users = assigns(:users)
@@ -60,7 +60,7 class UsersControllerTest < Redmine::ControllerTest
60 end
60 end
61
61
62 def test_index_with_group_filter
62 def test_index_with_group_filter
63 get :index, :group_id => '10'
63 get :index, :params => {:group_id => '10'}
64 assert_response :success
64 assert_response :success
65 assert_template 'index'
65 assert_template 'index'
66 users = assigns(:users)
66 users = assigns(:users)
@@ -73,7 +73,7 class UsersControllerTest < Redmine::ControllerTest
73
73
74 def test_show
74 def test_show
75 @request.session[:user_id] = nil
75 @request.session[:user_id] = nil
76 get :show, :id => 2
76 get :show, :params => {:id => 2}
77 assert_response :success
77 assert_response :success
78 assert_template 'show'
78 assert_template 'show'
79 assert_not_nil assigns(:user)
79 assert_not_nil assigns(:user)
@@ -84,7 +84,7 class UsersControllerTest < Redmine::ControllerTest
84 def test_show_should_not_display_hidden_custom_fields
84 def test_show_should_not_display_hidden_custom_fields
85 @request.session[:user_id] = nil
85 @request.session[:user_id] = nil
86 UserCustomField.find_by_name('Phone number').update_attribute :visible, false
86 UserCustomField.find_by_name('Phone number').update_attribute :visible, false
87 get :show, :id => 2
87 get :show, :params => {:id => 2}
88 assert_response :success
88 assert_response :success
89 assert_template 'show'
89 assert_template 'show'
90 assert_not_nil assigns(:user)
90 assert_not_nil assigns(:user)
@@ -99,19 +99,19 class UsersControllerTest < Redmine::ControllerTest
99 custom_field = CustomField.create!(:name => 'Testing', :field_format => 'text')
99 custom_field = CustomField.create!(:name => 'Testing', :field_format => 'text')
100 custom_value = user.custom_values.build(:custom_field => custom_field).save!
100 custom_value = user.custom_values.build(:custom_field => custom_field).save!
101
101
102 get :show, :id => 2
102 get :show, :params => {:id => 2}
103 assert_response :success
103 assert_response :success
104 end
104 end
105
105
106 def test_show_inactive
106 def test_show_inactive
107 @request.session[:user_id] = nil
107 @request.session[:user_id] = nil
108 get :show, :id => 5
108 get :show, :params => {:id => 5}
109 assert_response 404
109 assert_response 404
110 end
110 end
111
111
112 def test_show_inactive_by_admin
112 def test_show_inactive_by_admin
113 @request.session[:user_id] = 1
113 @request.session[:user_id] = 1
114 get :show, :id => 5
114 get :show, :params => {:id => 5}
115 assert_response 200
115 assert_response 200
116 assert_not_nil assigns(:user)
116 assert_not_nil assigns(:user)
117 end
117 end
@@ -121,13 +121,13 class UsersControllerTest < Redmine::ControllerTest
121 user = User.generate!
121 user = User.generate!
122
122
123 @request.session[:user_id] = nil
123 @request.session[:user_id] = nil
124 get :show, :id => user.id
124 get :show, :params => {:id => user.id}
125 assert_response 404
125 assert_response 404
126 end
126 end
127
127
128 def test_show_displays_memberships_based_on_project_visibility
128 def test_show_displays_memberships_based_on_project_visibility
129 @request.session[:user_id] = 1
129 @request.session[:user_id] = 1
130 get :show, :id => 2
130 get :show, :params => {:id => 2}
131 assert_response :success
131 assert_response :success
132 memberships = assigns(:memberships)
132 memberships = assigns(:memberships)
133 assert_not_nil memberships
133 assert_not_nil memberships
@@ -137,13 +137,13 class UsersControllerTest < Redmine::ControllerTest
137
137
138 def test_show_current_should_require_authentication
138 def test_show_current_should_require_authentication
139 @request.session[:user_id] = nil
139 @request.session[:user_id] = nil
140 get :show, :id => 'current'
140 get :show, :params => {:id => 'current'}
141 assert_response 302
141 assert_response 302
142 end
142 end
143
143
144 def test_show_current
144 def test_show_current
145 @request.session[:user_id] = 2
145 @request.session[:user_id] = 2
146 get :show, :id => 'current'
146 get :show, :params => {:id => 'current'}
147 assert_response :success
147 assert_response :success
148 assert_template 'show'
148 assert_template 'show'
149 assert_equal User.find(2), assigns(:user)
149 assert_equal User.find(2), assigns(:user)
@@ -161,7 +161,7 class UsersControllerTest < Redmine::ControllerTest
161
161
162 assert_difference 'User.count' do
162 assert_difference 'User.count' do
163 assert_difference 'ActionMailer::Base.deliveries.size' do
163 assert_difference 'ActionMailer::Base.deliveries.size' do
164 post :create,
164 post :create, :params => {
165 :user => {
165 :user => {
166 :firstname => 'John',
166 :firstname => 'John',
167 :lastname => 'Doe',
167 :lastname => 'Doe',
@@ -172,6 +172,7 class UsersControllerTest < Redmine::ControllerTest
172 :mail_notification => 'none'
172 :mail_notification => 'none'
173 },
173 },
174 :send_information => '1'
174 :send_information => '1'
175 }
175 end
176 end
176 end
177 end
177
178
@@ -193,7 +194,7 class UsersControllerTest < Redmine::ControllerTest
193
194
194 def test_create_with_preferences
195 def test_create_with_preferences
195 assert_difference 'User.count' do
196 assert_difference 'User.count' do
196 post :create,
197 post :create, :params => {
197 :user => {
198 :user => {
198 :firstname => 'John',
199 :firstname => 'John',
199 :lastname => 'Doe',
200 :lastname => 'Doe',
@@ -209,6 +210,7 class UsersControllerTest < Redmine::ControllerTest
209 'comments_sorting' => 'desc',
210 'comments_sorting' => 'desc',
210 'warn_on_leaving_unsaved' => '0'
211 'warn_on_leaving_unsaved' => '0'
211 }
212 }
213 }
212 end
214 end
213 user = User.order('id DESC').first
215 user = User.order('id DESC').first
214 assert_equal 'jdoe', user.login
216 assert_equal 'jdoe', user.login
@@ -220,16 +222,19 class UsersControllerTest < Redmine::ControllerTest
220
222
221 def test_create_with_generate_password_should_email_the_password
223 def test_create_with_generate_password_should_email_the_password
222 assert_difference 'User.count' do
224 assert_difference 'User.count' do
223 post :create, :user => {
225 post :create, :params => {
224 :login => 'randompass',
226 :user => {
225 :firstname => 'Random',
227 :login => 'randompass',
226 :lastname => 'Pass',
228 :firstname => 'Random',
227 :mail => 'randompass@example.net',
229 :lastname => 'Pass',
228 :language => 'en',
230 :mail => 'randompass@example.net',
229 :generate_password => '1',
231 :language => 'en',
230 :password => '',
232 :generate_password => '1',
231 :password_confirmation => ''
233 :password => '',
232 }, :send_information => 1
234 :password_confirmation => ''
235 },
236 :send_information => 1
237 }
233 end
238 end
234 user = User.order('id DESC').first
239 user = User.order('id DESC').first
235 assert_equal 'randompass', user.login
240 assert_equal 'randompass', user.login
@@ -243,19 +248,22 class UsersControllerTest < Redmine::ControllerTest
243 end
248 end
244
249
245 def test_create_and_continue
250 def test_create_and_continue
246 post :create, :user => {
251 post :create, :params => {
252 :user => {
247 :login => 'randompass',
253 :login => 'randompass',
248 :firstname => 'Random',
254 :firstname => 'Random',
249 :lastname => 'Pass',
255 :lastname => 'Pass',
250 :mail => 'randompass@example.net',
256 :mail => 'randompass@example.net',
251 :generate_password => '1'
257 :generate_password => '1'
252 }, :continue => '1'
258 },
259 :continue => '1'
260 }
253 assert_redirected_to '/users/new?user%5Bgenerate_password%5D=1'
261 assert_redirected_to '/users/new?user%5Bgenerate_password%5D=1'
254 end
262 end
255
263
256 def test_create_with_failure
264 def test_create_with_failure
257 assert_no_difference 'User.count' do
265 assert_no_difference 'User.count' do
258 post :create, :user => {}
266 post :create, :params => {:user => {}}
259 end
267 end
260 assert_response :success
268 assert_response :success
261 assert_template 'new'
269 assert_template 'new'
@@ -263,7 +271,7 class UsersControllerTest < Redmine::ControllerTest
263
271
264 def test_create_with_failure_sould_preserve_preference
272 def test_create_with_failure_sould_preserve_preference
265 assert_no_difference 'User.count' do
273 assert_no_difference 'User.count' do
266 post :create,
274 post :create, :params => {
267 :user => {},
275 :user => {},
268 :pref => {
276 :pref => {
269 'no_self_notified' => '1',
277 'no_self_notified' => '1',
@@ -272,6 +280,7 class UsersControllerTest < Redmine::ControllerTest
272 'comments_sorting' => 'desc',
280 'comments_sorting' => 'desc',
273 'warn_on_leaving_unsaved' => '0'
281 'warn_on_leaving_unsaved' => '0'
274 }
282 }
283 }
275 end
284 end
276 assert_response :success
285 assert_response :success
277 assert_template 'new'
286 assert_template 'new'
@@ -282,7 +291,7 class UsersControllerTest < Redmine::ControllerTest
282
291
283 def test_create_admin_should_send_security_notification
292 def test_create_admin_should_send_security_notification
284 ActionMailer::Base.deliveries.clear
293 ActionMailer::Base.deliveries.clear
285 post :create,
294 post :create, :params => {
286 :user => {
295 :user => {
287 :firstname => 'Edgar',
296 :firstname => 'Edgar',
288 :lastname => 'Schmoe',
297 :lastname => 'Schmoe',
@@ -292,6 +301,7 class UsersControllerTest < Redmine::ControllerTest
292 :mail => 'eschmoe@example.foo',
301 :mail => 'eschmoe@example.foo',
293 :admin => '1'
302 :admin => '1'
294 }
303 }
304 }
295
305
296 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
306 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
297 assert_mail_body_match '0.0.0.0', mail
307 assert_mail_body_match '0.0.0.0', mail
@@ -308,7 +318,7 class UsersControllerTest < Redmine::ControllerTest
308
318
309 def test_create_non_admin_should_not_send_security_notification
319 def test_create_non_admin_should_not_send_security_notification
310 ActionMailer::Base.deliveries.clear
320 ActionMailer::Base.deliveries.clear
311 post :create,
321 post :create, :params => {
312 :user => {
322 :user => {
313 :firstname => 'Edgar',
323 :firstname => 'Edgar',
314 :lastname => 'Schmoe',
324 :lastname => 'Schmoe',
@@ -318,12 +328,13 class UsersControllerTest < Redmine::ControllerTest
318 :mail => 'eschmoe@example.foo',
328 :mail => 'eschmoe@example.foo',
319 :admin => '0'
329 :admin => '0'
320 }
330 }
331 }
321 assert_nil ActionMailer::Base.deliveries.last
332 assert_nil ActionMailer::Base.deliveries.last
322 end
333 end
323
334
324
335
325 def test_edit
336 def test_edit
326 get :edit, :id => 2
337 get :edit, :params => {:id => 2}
327 assert_response :success
338 assert_response :success
328 assert_template 'edit'
339 assert_template 'edit'
329 assert_equal User.find(2), assigns(:user)
340 assert_equal User.find(2), assigns(:user)
@@ -332,16 +343,18 class UsersControllerTest < Redmine::ControllerTest
332 def test_edit_registered_user
343 def test_edit_registered_user
333 assert User.find(2).register!
344 assert User.find(2).register!
334
345
335 get :edit, :id => 2
346 get :edit, :params => {:id => 2}
336 assert_response :success
347 assert_response :success
337 assert_select 'a', :text => 'Activate'
348 assert_select 'a', :text => 'Activate'
338 end
349 end
339
350
340 def test_update
351 def test_update
341 ActionMailer::Base.deliveries.clear
352 ActionMailer::Base.deliveries.clear
342 put :update, :id => 2,
353 put :update, :params => {
343 :user => {:firstname => 'Changed', :mail_notification => 'only_assigned'},
354 :id => 2,
344 :pref => {:hide_mail => '1', :comments_sorting => 'desc'}
355 :user => {:firstname => 'Changed', :mail_notification => 'only_assigned'},
356 :pref => {:hide_mail => '1', :comments_sorting => 'desc'}
357 }
345 user = User.find(2)
358 user = User.find(2)
346 assert_equal 'Changed', user.firstname
359 assert_equal 'Changed', user.firstname
347 assert_equal 'only_assigned', user.mail_notification
360 assert_equal 'only_assigned', user.mail_notification
@@ -352,14 +365,20 class UsersControllerTest < Redmine::ControllerTest
352
365
353 def test_update_with_failure
366 def test_update_with_failure
354 assert_no_difference 'User.count' do
367 assert_no_difference 'User.count' do
355 put :update, :id => 2, :user => {:firstname => ''}
368 put :update, :params => {
369 :id => 2,
370 :user => {:firstname => ''}
371 }
356 end
372 end
357 assert_response :success
373 assert_response :success
358 assert_template 'edit'
374 assert_template 'edit'
359 end
375 end
360
376
361 def test_update_with_group_ids_should_assign_groups
377 def test_update_with_group_ids_should_assign_groups
362 put :update, :id => 2, :user => {:group_ids => ['10']}
378 put :update, :params => {
379 :id => 2,
380 :user => {:group_ids => ['10']}
381 }
363 user = User.find(2)
382 user = User.find(2)
364 assert_equal [10], user.group_ids
383 assert_equal [10], user.group_ids
365 end
384 end
@@ -372,7 +391,10 class UsersControllerTest < Redmine::ControllerTest
372 ActionMailer::Base.deliveries.clear
391 ActionMailer::Base.deliveries.clear
373 Setting.bcc_recipients = '1'
392 Setting.bcc_recipients = '1'
374
393
375 put :update, :id => u.id, :user => {:status => User::STATUS_ACTIVE}
394 put :update, :params => {
395 :id => u.id,
396 :user => {:status => User::STATUS_ACTIVE}
397 }
376 assert u.reload.active?
398 assert u.reload.active?
377 mail = ActionMailer::Base.deliveries.last
399 mail = ActionMailer::Base.deliveries.last
378 assert_not_nil mail
400 assert_not_nil mail
@@ -384,7 +406,11 class UsersControllerTest < Redmine::ControllerTest
384 ActionMailer::Base.deliveries.clear
406 ActionMailer::Base.deliveries.clear
385 Setting.bcc_recipients = '1'
407 Setting.bcc_recipients = '1'
386
408
387 put :update, :id => 2, :user => {:password => 'newpass123', :password_confirmation => 'newpass123'}, :send_information => '1'
409 put :update, :params => {
410 :id => 2,
411 :user => {:password => 'newpass123', :password_confirmation => 'newpass123'},
412 :send_information => '1'
413 }
388 u = User.find(2)
414 u = User.find(2)
389 assert u.check_password?('newpass123')
415 assert u.check_password?('newpass123')
390
416
@@ -398,11 +424,15 class UsersControllerTest < Redmine::ControllerTest
398 ActionMailer::Base.deliveries.clear
424 ActionMailer::Base.deliveries.clear
399 Setting.bcc_recipients = '1'
425 Setting.bcc_recipients = '1'
400
426
401 put :update, :id => 2, :user => {
427 put :update, :params => {
402 :generate_password => '1',
428 :id => 2,
403 :password => '',
429 :user => {
404 :password_confirmation => ''
430 :generate_password => '1',
405 }, :send_information => '1'
431 :password => '',
432 :password_confirmation => ''
433 },
434 :send_information => '1'
435 }
406
436
407 mail = ActionMailer::Base.deliveries.last
437 mail = ActionMailer::Base.deliveries.last
408 assert_not_nil mail
438 assert_not_nil mail
@@ -413,12 +443,15 class UsersControllerTest < Redmine::ControllerTest
413 end
443 end
414
444
415 def test_update_without_generate_password_should_not_change_password
445 def test_update_without_generate_password_should_not_change_password
416 put :update, :id => 2, :user => {
446 put :update, :params => {
417 :firstname => 'changed',
447 :id => 2, :user => {
418 :generate_password => '0',
448 :firstname => 'changed',
419 :password => '',
449 :generate_password => '0',
420 :password_confirmation => ''
450 :password => '',
421 }, :send_information => '1'
451 :password_confirmation => ''
452 },
453 :send_information => '1'
454 }
422
455
423 user = User.find(2)
456 user = User.find(2)
424 assert_equal 'changed', user.firstname
457 assert_equal 'changed', user.firstname
@@ -431,14 +464,17 class UsersControllerTest < Redmine::ControllerTest
431 u.auth_source = AuthSource.find(1)
464 u.auth_source = AuthSource.find(1)
432 u.save!
465 u.save!
433
466
434 put :update, :id => u.id, :user => {:auth_source_id => '', :password => 'newpass123', :password_confirmation => 'newpass123'}
467 put :update, :params => {
468 :id => u.id,
469 :user => {:auth_source_id => '', :password => 'newpass123', :password_confirmation => 'newpass123'}
470 }
435
471
436 assert_equal nil, u.reload.auth_source
472 assert_equal nil, u.reload.auth_source
437 assert u.check_password?('newpass123')
473 assert u.check_password?('newpass123')
438 end
474 end
439
475
440 def test_update_notified_project
476 def test_update_notified_project
441 get :edit, :id => 2
477 get :edit, :params => {:id => 2}
442 assert_response :success
478 assert_response :success
443 assert_template 'edit'
479 assert_template 'edit'
444 u = User.find(2)
480 u = User.find(2)
@@ -446,11 +482,13 class UsersControllerTest < Redmine::ControllerTest
446 assert_equal [1, 2, 5], u.notified_projects_ids.sort
482 assert_equal [1, 2, 5], u.notified_projects_ids.sort
447 assert_select 'input[name=?][value=?]', 'user[notified_project_ids][]', '1'
483 assert_select 'input[name=?][value=?]', 'user[notified_project_ids][]', '1'
448 assert_equal 'all', u.mail_notification
484 assert_equal 'all', u.mail_notification
449 put :update, :id => 2,
485 put :update, :params => {
450 :user => {
486 :id => 2,
451 :mail_notification => 'selected',
487 :user => {
452 :notified_project_ids => [1, 2]
488 :mail_notification => 'selected',
453 }
489 :notified_project_ids => [1, 2]
490 }
491 }
454 u = User.find(2)
492 u = User.find(2)
455 assert_equal 'selected', u.mail_notification
493 assert_equal 'selected', u.mail_notification
456 assert_equal [1, 2], u.notified_projects_ids.sort
494 assert_equal [1, 2], u.notified_projects_ids.sort
@@ -461,7 +499,10 class UsersControllerTest < Redmine::ControllerTest
461 user.pref[:no_self_notified] = '1'
499 user.pref[:no_self_notified] = '1'
462 user.pref.save
500 user.pref.save
463
501
464 put :update, :id => 2, :user => {:status => 3}
502 put :update, :params => {
503 :id => 2,
504 :user => {:status => 3}
505 }
465 assert_response 302
506 assert_response 302
466 user = User.find(2)
507 user = User.find(2)
467 assert_equal 3, user.status
508 assert_equal 3, user.status
@@ -470,8 +511,9 class UsersControllerTest < Redmine::ControllerTest
470
511
471 def test_update_assign_admin_should_send_security_notification
512 def test_update_assign_admin_should_send_security_notification
472 ActionMailer::Base.deliveries.clear
513 ActionMailer::Base.deliveries.clear
473 put :update, :id => 2, :user => {
514 put :update, :params => {
474 :admin => 1
515 :id => 2,
516 :user => {:admin => 1}
475 }
517 }
476
518
477 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
519 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
@@ -489,8 +531,9 class UsersControllerTest < Redmine::ControllerTest
489 user.save!
531 user.save!
490
532
491 ActionMailer::Base.deliveries.clear
533 ActionMailer::Base.deliveries.clear
492 put :update, :id => user.id, :user => {
534 put :update, :params => {
493 :admin => 0
535 :id => user.id,
536 :user => {:admin => 0}
494 }
537 }
495
538
496 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
539 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
@@ -508,8 +551,9 class UsersControllerTest < Redmine::ControllerTest
508 user.save!
551 user.save!
509
552
510 ActionMailer::Base.deliveries.clear
553 ActionMailer::Base.deliveries.clear
511 put :update, :id => 2, :user => {
554 put :update, :params => {
512 :status => Principal::STATUS_LOCKED
555 :id => 2,
556 :user => {:status => Principal::STATUS_LOCKED}
513 }
557 }
514
558
515 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
559 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
@@ -523,7 +567,7 class UsersControllerTest < Redmine::ControllerTest
523 # if user is already locked, destroying should not send a second mail
567 # if user is already locked, destroying should not send a second mail
524 # (for active admins see furtherbelow)
568 # (for active admins see furtherbelow)
525 ActionMailer::Base.deliveries.clear
569 ActionMailer::Base.deliveries.clear
526 delete :destroy, :id => 1
570 delete :destroy, :params => {:id => 1}
527 assert_nil ActionMailer::Base.deliveries.last
571 assert_nil ActionMailer::Base.deliveries.last
528
572
529 end
573 end
@@ -533,8 +577,9 class UsersControllerTest < Redmine::ControllerTest
533 user.admin = true
577 user.admin = true
534 user.save!
578 user.save!
535 ActionMailer::Base.deliveries.clear
579 ActionMailer::Base.deliveries.clear
536 put :update, :id => user.id, :user => {
580 put :update, :params => {
537 :status => Principal::STATUS_ACTIVE
581 :id => user.id,
582 :user => {:status => Principal::STATUS_ACTIVE}
538 }
583 }
539
584
540 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
585 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
@@ -548,15 +593,16 class UsersControllerTest < Redmine::ControllerTest
548
593
549 def test_update_admin_unrelated_property_should_not_send_security_notification
594 def test_update_admin_unrelated_property_should_not_send_security_notification
550 ActionMailer::Base.deliveries.clear
595 ActionMailer::Base.deliveries.clear
551 put :update, :id => 1, :user => {
596 put :update, :params => {
552 :firstname => 'Jimmy'
597 :id => 1,
598 :user => {:firstname => 'Jimmy'}
553 }
599 }
554 assert_nil ActionMailer::Base.deliveries.last
600 assert_nil ActionMailer::Base.deliveries.last
555 end
601 end
556
602
557 def test_destroy
603 def test_destroy
558 assert_difference 'User.count', -1 do
604 assert_difference 'User.count', -1 do
559 delete :destroy, :id => 2
605 delete :destroy, :params => {:id => 2}
560 end
606 end
561 assert_redirected_to '/users'
607 assert_redirected_to '/users'
562 assert_nil User.find_by_id(2)
608 assert_nil User.find_by_id(2)
@@ -566,14 +612,14 class UsersControllerTest < Redmine::ControllerTest
566 @request.session[:user_id] = 3
612 @request.session[:user_id] = 3
567
613
568 assert_no_difference 'User.count' do
614 assert_no_difference 'User.count' do
569 get :destroy, :id => 2
615 get :destroy, :params => {:id => 2}
570 end
616 end
571 assert_response 403
617 assert_response 403
572 end
618 end
573
619
574 def test_destroy_should_redirect_to_back_url_param
620 def test_destroy_should_redirect_to_back_url_param
575 assert_difference 'User.count', -1 do
621 assert_difference 'User.count', -1 do
576 delete :destroy, :id => 2, :back_url => '/users?name=foo'
622 delete :destroy, :params => {:id => 2, :back_url => '/users?name=foo'}
577 end
623 end
578 assert_redirected_to '/users?name=foo'
624 assert_redirected_to '/users?name=foo'
579 end
625 end
@@ -583,7 +629,7 class UsersControllerTest < Redmine::ControllerTest
583 user.admin = true
629 user.admin = true
584 user.save!
630 user.save!
585 ActionMailer::Base.deliveries.clear
631 ActionMailer::Base.deliveries.clear
586 delete :destroy, :id => user.id
632 delete :destroy, :params => {:id => user.id}
587
633
588 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
634 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
589 assert_mail_body_match I18n.t(:mail_body_security_notification_remove, field: I18n.t(:field_admin), value: user.login), mail
635 assert_mail_body_match I18n.t(:mail_body_security_notification_remove, field: I18n.t(:field_admin), value: user.login), mail
Show file before | Show file after | Hide comments
@@ -278,6 +278,14 module Redmine
278 end
278 end
279
279
280 class ControllerTest < ActionController::TestCase
280 class ControllerTest < ActionController::TestCase
281 def process(method, path, parameters={}, options={})
282 if parameters.key?(:params)
283 raise ArgumentError if options.present?
284 super method, path, parameters[:params], parameters.except(:params)
285 else
286 super
287 end
288 end
281 end
289 end
282
290
283 class IntegrationTest < ActionDispatch::IntegrationTest
291 class IntegrationTest < ActionDispatch::IntegrationTest
General Comments 0
You need to be logged in to leave comments. Login now