summaryrefslogtreecommitdiff
path: root/users/test/integration/api
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-01-14 20:11:49 +0100
committerAzul <azul@leap.se>2013-01-14 20:11:49 +0100
commit8445e6b1a026c8f15fffae7544b84407e9bbce1b (patch)
tree859adf3bac117389595460916f45cfeab49f58cb /users/test/integration/api
parentf75005e1bc15101f37d377b7ed06f877dc206ee0 (diff)
parentee2ea4ac8f4c6b0c3b09be6ed49e7a1faec7a9c1 (diff)
Merge branch 'master' into feature/fixing-routes-with-api
Diffstat (limited to 'users/test/integration/api')
-rw-r--r--users/test/integration/api/account_flow_test.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/users/test/integration/api/account_flow_test.rb b/users/test/integration/api/account_flow_test.rb
index 7636f2b..b9e2a4e 100644
--- a/users/test/integration/api/account_flow_test.rb
+++ b/users/test/integration/api/account_flow_test.rb
@@ -12,10 +12,6 @@ class AccountFlowTest < ActiveSupport::TestCase
OUTER_APP
end
- def teardown
- Warden.test_reset!
- end
-
def setup
@login = "integration_test_user"
User.find_by_login(@login).tap{|u| u.destroy if u}
@@ -31,7 +27,8 @@ class AccountFlowTest < ActiveSupport::TestCase
end
def teardown
- @user.destroy if @user # make sure we can run this test again
+ @user.destroy if @user
+ Warden.test_reset!
end
# this test wraps the api and implements the interface the ruby-srp client.