dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplied handling of postbacks

Browse Source
This commit is contained in:
mdipierro
2012-08-29 18:14:24 -05:00
parent 1abc8e7f13
commit cfcc72de6f
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.1 (2012-08-29 18:01:24) rc4 Version 2.00.1 (2012-08-29 18:14:21) rc4
gluon/contrib/webclient.py
+4 -3
View File
@@ -21,6 +21,8 @@ class WebClient(object):
return self.post(url,data=None,cookies=cookies,headers=headers) return self.post(url,data=None,cookies=cookies,headers=headers)
def post(self,url,data=None,cookies=None,headers=None,auth=None): def post(self,url,data=None,cookies=None,headers=None,auth=None):
if data and '_formname' in data:
self.get(url,cookies=None,headers=None,auth=None)
self.url = self.app+url self.url = self.app+url
if cookies is None: cookies = self.cookies if cookies is None: cookies = self.cookies
if auth: if auth:
@@ -62,8 +64,9 @@ class WebClient(object):
def test_web2py_registration_and_login(): def test_web2py_registration_and_login():
session = WebClient('http://127.0.0.1:8000/welcome/default/') session = WebClient('http://127.0.0.1:8000/welcome/default/')
session.get('user/register') session.get('index')
session_id_welcome = session.cookies['session_id_welcome'] session_id_welcome = session.cookies['session_id_welcome']
data = dict(first_name = 'Homer', data = dict(first_name = 'Homer',
last_name = 'Simpson', last_name = 'Simpson',
email = 'homer@web2py.com', email = 'homer@web2py.com',
@@ -72,7 +75,6 @@ def test_web2py_registration_and_login():
_formname = 'register') _formname = 'register')
session.post('user/register',data = data) session.post('user/register',data = data)
session.get('user/login')
data = dict(email='homer@web2py.com', data = dict(email='homer@web2py.com',
password='test', password='test',
_formname = 'login') _formname = 'login')
@@ -86,7 +88,6 @@ def test_web2py_registration_and_login():
# check we are always in the same session # check we are always in the same session
assert session_id_welcome == session.cookies['session_id_welcome'] assert session_id_welcome == session.cookies['session_id_welcome']
if __name__ == '__main__': if __name__ == '__main__':
test_web2py_registration_and_login() test_web2py_registration_and_login()
gluon/tests/test_web.py
+3 -2
View File
@@ -16,8 +16,9 @@ from gluon.contrib.webclient import WebClient
class TestWeb(unittest.TestCase): class TestWeb(unittest.TestCase):
def testWebClient(self): def testWebClient(self):
session = WebClient('http://127.0.0.1:8000/welcome/default/') session = WebClient('http://127.0.0.1:8000/welcome/default/')
session.get('user/register') session.get('index')
session_id_welcome = session.cookies['session_id_welcome'] session_id_welcome = session.cookies['session_id_welcome']
data = dict(first_name = 'Homer', data = dict(first_name = 'Homer',
last_name = 'Simpson', last_name = 'Simpson',
email = 'homer@web2py.com', email = 'homer@web2py.com',
@@ -26,7 +27,7 @@ class TestWeb(unittest.TestCase):
_formname = 'register') _formname = 'register')
session.post('user/register',data = data) session.post('user/register',data = data)
session.get('user/login')
data = dict(email='homer@web2py.com', data = dict(email='homer@web2py.com',
password='test', password='test',
_formname = 'login') _formname = 'login')