diff options
author | Azul <azul@leap.se> | 2012-10-11 12:52:40 +0200 |
---|---|---|
committer | Azul <azul@leap.se> | 2012-10-11 12:52:40 +0200 |
commit | 10441deba145f53604ca3b981374f1ee6619c400 (patch) | |
tree | 90d2a851cd558652121182937a5ec8373722cab0 /users/test/integration/api/python/signup_and_login.py | |
parent | 61d73ac517ccbcc7ca8892010ef89e861052807f (diff) | |
parent | 33ef3d2ac9a03b06ff29f1367c69731a89f1dfc7 (diff) |
Merge branch 'release-0.1.0'
Diffstat (limited to 'users/test/integration/api/python/signup_and_login.py')
-rwxr-xr-x | users/test/integration/api/python/signup_and_login.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/users/test/integration/api/python/signup_and_login.py b/users/test/integration/api/python/signup_and_login.py index 2d79688..ac611d7 100755 --- a/users/test/integration/api/python/signup_and_login.py +++ b/users/test/integration/api/python/signup_and_login.py @@ -20,14 +20,13 @@ def print_and_parse(response): print response.request.method + ': ' + response.url print " " + json.dumps(response.request.data) print " -> " + response.text - print " () " + json.dumps(requests.utils.dict_from_cookiejar(response.cookies)) return json.loads(response.text) def signup(session): user_params = { 'user[login]': id_generator(), 'user[password_verifier]': '12345', - 'user[password_salt]': '54321' + 'user[password_salt]': 'AB54321' } return session.post(server + '/users.json', data = user_params) @@ -36,11 +35,8 @@ def authenticate(session, login): 'login': login, 'A': '12345', } - init = session.post(server + '/sessions', data = params) - cookies = requests.utils.dict_from_cookiejar(init.cookies) - init = session.post(server + '/sessions', data = params, cookies = cookies) - print "(%) " + json.dumps(cookies) - return session.put(server + '/sessions/' + login, data = {'client_auth': '123'}, cookies = cookies) + init = print_and_parse(session.post(server + '/sessions', data = params)) + return session.put(server + '/sessions/' + login, data = {'client_auth': '123'}) session = requests.session() user = print_and_parse(signup(session)) |