summaryrefslogtreecommitdiff
path: root/test/support
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/support
parent0ba489bdb01bb2f0536d2603bd389d448712e336 (diff)
allow user accounts to be re-enabled, and for associated identities to also get re-enabled.
Diffstat (limited to 'test/support')
-rw-r--r--test/support/api_integration_test.rb2
-rw-r--r--test/support/browser_integration_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/support/api_integration_test.rb b/test/support/api_integration_test.rb
index 4077920..3b3481b 100644
--- a/test/support/api_integration_test.rb
+++ b/test/support/api_integration_test.rb
@@ -21,7 +21,7 @@ class ApiIntegrationTest < ActionDispatch::IntegrationTest
teardown do
if @user && @user.persisted?
- Identity.destroy_all_for @user
+ @user.destroy_identities
@user.reload.destroy
end
if @token && @token.persisted?
diff --git a/test/support/browser_integration_test.rb b/test/support/browser_integration_test.rb
index 950a395..1deb8fa 100644
--- a/test/support/browser_integration_test.rb
+++ b/test/support/browser_integration_test.rb
@@ -86,7 +86,7 @@ class BrowserIntegrationTest < ActionDispatch::IntegrationTest
teardown do
if @user && @user.reload
- Identity.destroy_all_for @user
+ @user.destroy_identities
@user.destroy
end
end