summaryrefslogtreecommitdiff
path: root/test/integration/api
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-03-11 01:12:23 -0700
committerelijah <elijah@riseup.net>2015-03-17 22:36:27 -0700
commit9266c3ac58404894539e25e514d8d8a6775c701f (patch)
tree3beaa846b37aecdf933763564710c2e1042c03a3 /test/integration/api
parenta777c4c677e8cbd4f91c66a29ee1ecb347c5b8ab (diff)
add support for rotating tokens and sessions databases, and for a special tmp db for test users.
Diffstat (limited to 'test/integration/api')
-rw-r--r--test/integration/api/srp_test.rb10
-rw-r--r--test/integration/api/tmp_user_test.rb19
2 files changed, 27 insertions, 2 deletions
diff --git a/test/integration/api/srp_test.rb b/test/integration/api/srp_test.rb
index 946450e..fbef47e 100644
--- a/test/integration/api/srp_test.rb
+++ b/test/integration/api/srp_test.rb
@@ -32,11 +32,11 @@ class SrpTest < RackTest
attr_reader :server_auth
- def register_user(login = "integration_test_user", password = 'srp, verify me!')
+ def register_user(login = "integration_test", password = 'srp, verify me!')
cleanup_user(login)
post 'http://api.lvh.me:3000/1/users.json',
user_params(login: login, password: password)
- @user = User.find_by_login(login)
+ assert(@user = User.find_by_login(login), 'user should have been created: %s' % last_response_errors)
@login = login
@password = password
end
@@ -101,4 +101,10 @@ class SrpTest < RackTest
SRP::Client.new(params.delete(:login) || @login, params)
end
end
+
+ def last_response_errors
+ JSON.parse(last_response.body)['errors']
+ rescue
+ ""
+ end
end
diff --git a/test/integration/api/tmp_user_test.rb b/test/integration/api/tmp_user_test.rb
new file mode 100644
index 0000000..4c1e659
--- /dev/null
+++ b/test/integration/api/tmp_user_test.rb
@@ -0,0 +1,19 @@
+require 'test_helper'
+require_relative 'srp_test'
+
+class TmpUserTest < SrpTest
+
+ setup do
+ register_user('test_user_'+SecureRandom.hex(5))
+ end
+
+ test "login with srp" do
+ authenticate
+ assert_nil server_auth["errors"]
+ assert_nil server_auth["error"]
+ assert_equal ["M2", "id", "token"], server_auth.keys
+ assert last_response.successful?
+ assert server_auth["M2"]
+ end
+
+end