summaryrefslogtreecommitdiff
path: root/test/functional/users_controller_test.rb
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-02-10 10:56:57 -0800
committerelijah <elijah@riseup.net>2016-02-10 10:56:57 -0800
commit49d3e9df74685fe17a2abbbabdd17014f2371065 (patch)
tree41dc44c41659e2f970b84ac2fe0da8152422efee /test/functional/users_controller_test.rb
parent0ba489bdb01bb2f0536d2603bd389d448712e336 (diff)
allow user accounts to be re-enabled, and for associated identities to also get re-enabled.
Diffstat (limited to 'test/functional/users_controller_test.rb')
-rw-r--r--test/functional/users_controller_test.rb4
1 files changed, 2 insertions, 2 deletions
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