| @@ -296,13 +296,13 class UsersControllerTest < ActionController::TestCase | |||
|
|
296 | 296 | assert_mail_body_match 'newpass', mail |
|
|
297 | 297 | end |
|
|
298 | 298 | |
|
|
299 | test "put :update with a password change to an AuthSource user switching to Internal authentication" do | |
|
|
299 | def test_update_user_switchin_from_auth_source_to_password_authentication | |
|
|
300 | 300 | # Configure as auth source |
|
|
301 | 301 | u = User.find(2) |
|
|
302 | 302 | u.auth_source = AuthSource.find(1) |
|
|
303 | 303 | u.save! |
|
|
304 | 304 | |
|
|
305 |
put :update, :id => u.id, :user => {:auth_source_id => '', :password => 'newpass' |
|
|
|
305 | put :update, :id => u.id, :user => {:auth_source_id => '', :password => 'newpass', :password_confirmation => 'newpass'} | |
|
|
306 | 306 | |
|
|
307 | 307 | assert_equal nil, u.reload.auth_source |
|
|
308 | 308 | assert u.check_password?('newpass') |
| @@ -336,6 +336,27 class UsersControllerTest < ActionController::TestCase | |||
|
|
336 | 336 | assert_equal 3, member.project_id |
|
|
337 | 337 | end |
|
|
338 | 338 | |
|
|
339 | def test_create_membership_js_format | |
|
|
340 | assert_difference 'Member.count' do | |
|
|
341 | post :edit_membership, :id => 7, :membership => {:project_id => 3, :role_ids => [2]}, :format => 'js' | |
|
|
342 | end | |
|
|
343 | assert_response :success | |
|
|
344 | assert_select_rjs :replace_html, 'tab-content-memberships' | |
|
|
345 | member = Member.first(:order => 'id DESC') | |
|
|
346 | assert_equal User.find(7), member.principal | |
|
|
347 | assert_equal [2], member.role_ids | |
|
|
348 | assert_equal 3, member.project_id | |
|
|
349 | end | |
|
|
350 | ||
|
|
351 | def test_create_membership_js_format_with_failure | |
|
|
352 | assert_no_difference 'Member.count' do | |
|
|
353 | post :edit_membership, :id => 7, :membership => {:project_id => 3}, :format => 'js' | |
|
|
354 | end | |
|
|
355 | assert_response :success | |
|
|
356 | assert @response.body.match(/alert/i), "Alert message not sent" | |
|
|
357 | assert @response.body.match(/role can't be empty/i), "Error message not sent" | |
|
|
358 | end | |
|
|
359 | ||
|
|
339 | 360 | def test_update_membership |
|
|
340 | 361 | assert_no_difference 'Member.count' do |
|
|
341 | 362 | put :edit_membership, :id => 2, :membership_id => 1, :membership => { :role_ids => [2]} |
| @@ -344,6 +365,14 class UsersControllerTest < ActionController::TestCase | |||
|
|
344 | 365 | assert_equal [2], Member.find(1).role_ids |
|
|
345 | 366 | end |
|
|
346 | 367 | |
|
|
368 | def test_update_membership_js_format | |
|
|
369 | assert_no_difference 'Member.count' do | |
|
|
370 | put :edit_membership, :id => 2, :membership_id => 1, :membership => {:role_ids => [2]}, :format => 'js' | |
|
|
371 | end | |
|
|
372 | assert_response :success | |
|
|
373 | assert_select_rjs :replace_html, 'tab-content-memberships' | |
|
|
374 | end | |
|
|
375 | ||
|
|
347 | 376 | def test_destroy_membership |
|
|
348 | 377 | assert_difference 'Member.count', -1 do |
|
|
349 | 378 | delete :destroy_membership, :id => 2, :membership_id => 1 |
| @@ -351,4 +380,12 class UsersControllerTest < ActionController::TestCase | |||
|
|
351 | 380 | assert_redirected_to :action => 'edit', :id => '2', :tab => 'memberships' |
|
|
352 | 381 | assert_nil Member.find_by_id(1) |
|
|
353 | 382 | end |
|
|
383 | ||
|
|
384 | def test_destroy_membership_js_format | |
|
|
385 | assert_difference 'Member.count', -1 do | |
|
|
386 | delete :destroy_membership, :id => 2, :membership_id => 1, :format => 'js' | |
|
|
387 | end | |
|
|
388 | assert_response :success | |
|
|
389 | assert_select_rjs :replace_html, 'tab-content-memberships' | |
|
|
390 | end | |
|
|
354 | 391 | end |
General Comments 0
You need to be logged in to leave comments.
Login now