[Checkins] SVN: z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/ snapshot session login (tests still break)
Michael Howitz
mh at gocept.com
Sun Mar 8 09:30:52 EDT 2009
Log message for revision 97665:
snapshot session login (tests still break)
Changed:
U z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/browser/auth.py
U z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/login.txt
U z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/tests/ftesting.zcml
-=-
Modified: z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/browser/auth.py
===================================================================
--- z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/browser/auth.py 2009-03-08 13:07:59 UTC (rev 97664)
+++ z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/browser/auth.py 2009-03-08 13:30:52 UTC (rev 97665)
@@ -25,6 +25,7 @@
import zope.i18nmessageid
import zope.interface
import zope.publisher.interfaces.browser
+import zope.traversing.browser.interfaces
import zope.viewlet.interfaces
import zope.viewlet.manager
import zope.viewlet.viewlet
@@ -57,13 +58,13 @@
"Compute the url of a view."
if view_name.startswith('@@'):
view_name = view_name[2:]
- view_truncated = True
+ view_name_truncated = True
else:
- view_truncated = False
+ view_name_truncated = False
view = zope.component.getMultiAdapter((context, request), name=view_name)
view_url = zope.component.getMultiAdapter(
(view, request), name='absolute_url')()
- if view_truncated:
+ if view_name_truncated:
view_url = view_url.replace(view_name, '@@'+view_name)
return view_url
Modified: z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/login.txt
===================================================================
--- z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/login.txt 2009-03-08 13:07:59 UTC (rev 97664)
+++ z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/login.txt 2009-03-08 13:30:52 UTC (rev 97665)
@@ -398,11 +398,35 @@
</html>
-After entering correct username and passord the user gets authorized:
+After entering a correct username and password the user gets
+authorized:
>>> browser.getControl('User Name').value = 'tester'
>>> browser.getControl('Password').value = 'tpass'
- >>> browser.handleErrors = False
+ >>> browser.getControl('Log in').click()
-.. >>> browser.getControl('Log in').click()
+The user gets redirected to the page where he selected the login
+link. After logging in the login link is no longer displayed. As we
+already specified that logout is supported, a logout link is
+displayed:
+ >>> browser.url
+ 'http://localhost/++skin++PageletTestSkin/container/@@default.html'
+ >>> print browser.contents
+ <!DOCTYPE ...>
+ <html ...>
+ <head>
+ <title>PageletTest</title>
+ </head>
+ <body>
+ <a href="http://localhost/++skin++PageletTestSkin/container/@@logout.html?nextURL=http%3A//localhost/%2B%2Bskin%2B%2BPageletTestSkin/container/%40%40default.html">Logout</a>
+ </body>
+ </html>
+
+
+Calling the login URL again leads directly to the page referred in
+nextURL:
+
+ >>> browser.open(login_url)
+ >>> browser.url
+ 'http://localhost/++skin++PageletTestSkin/container/@@default.html'
Modified: z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/tests/ftesting.zcml
===================================================================
--- z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/tests/ftesting.zcml 2009-03-08 13:07:59 UTC (rev 97664)
+++ z3c.layer.pagelet/branches/icemac_login_support/src/z3c/layer/pagelet/tests/ftesting.zcml 2009-03-08 13:30:52 UTC (rev 97665)
@@ -8,7 +8,6 @@
<!-- exclude will prevent from include -->
<exclude package="zope.app.authentication" file="ftpplugins.zcml" />
<exclude package="zope.app.authentication" file="groupfolder.zcml" />
- <exclude package="zope.app.authentication" file="principalfolder.zcml" />
<exclude package="zope.app.authentication.browser" />
<exclude package="zope.app.authentication.browser" file="configure.zcml" />
<exclude package="zope.app.authentication.browser" file="groupfolder.zcml" />
More information about the Checkins
mailing list