diff options
| author | elijah <elijah@riseup.net> | 2016-02-10 10:56:57 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-02-10 10:56:57 -0800 |
| commit | 49d3e9df74685fe17a2abbbabdd17014f2371065 (patch) | |
| tree | 41dc44c41659e2f970b84ac2fe0da8152422efee /test/functional | |
| parent | 0ba489bdb01bb2f0536d2603bd389d448712e336 (diff) | |
allow user accounts to be re-enabled, and for associated identities to also get re-enabled.
Diffstat (limited to 'test/functional')
| -rw-r--r-- | test/functional/identities_controller_test.rb | 2 | ||||
| -rw-r--r-- | test/functional/users_controller_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/identities_controller_test.rb b/test/functional/identities_controller_test.rb index e491c52..5af2e88 100644 --- a/test/functional/identities_controller_test.rb +++ b/test/functional/identities_controller_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require_relative '../test_helper' class IdentitiesControllerTest < ActionController::TestCase diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb index 261f201..7b24098 100644 --- a/test/functional/users_controller_test.rb +++ b/test/functional/users_controller_test.rb @@ -86,7 +86,7 @@ class UsersControllerTest < ActionController::TestCase # we destroy the user record and the associated data... user.expects(:destroy) - Identity.expects(:disable_all_for).with(user) + #user.identity.expects(:orphan!) << factory girl user doesn't have identities Ticket.expects(:destroy_all_from).with(user) login :is_admin? => true @@ -101,7 +101,7 @@ class UsersControllerTest < ActionController::TestCase # we destroy the user record and the associated data... user.expects(:destroy) - Identity.expects(:disable_all_for).with(user) + #user.identity.expects(:orphan!) << factory girl user doesn't have identities Ticket.expects(:destroy_all_from).with(user) login user |