diff options
author | jessib <jessib@leap.se> | 2013-01-14 11:50:54 -0800 |
---|---|---|
committer | jessib <jessib@leap.se> | 2013-01-14 11:50:54 -0800 |
commit | c2f232d994b3ee01ff9d50da1e4f3798df2136f3 (patch) | |
tree | 5b7a11e9aed58357d2a38b248b965cd936de6888 /users/test/integration/api | |
parent | d81bf00ecd8bdfcddf50e4881428c917253326fe (diff) | |
parent | ee2ea4ac8f4c6b0c3b09be6ed49e7a1faec7a9c1 (diff) |
Merge branch 'master' into feature/show_user. Added new tests.
Conflicts:
users/test/functional/users_controller_test.rb
Diffstat (limited to 'users/test/integration/api')
-rw-r--r-- | users/test/integration/api/account_flow_test.rb | 7 |
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. |