From 49d3e9df74685fe17a2abbbabdd17014f2371065 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 10 Feb 2016 10:56:57 -0800 Subject: allow user accounts to be re-enabled, and for associated identities to also get re-enabled. --- test/functional/identities_controller_test.rb | 2 +- test/functional/users_controller_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test/functional') 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 -- cgit v1.2.3