[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/ - some cleanup (svn properties, headers, whitespace)
Yvo Schubbe
y.2010 at wcm-solutions.de
Fri Jul 2 03:14:03 EDT 2010
Log message for revision 114089:
- some cleanup (svn properties, headers, whitespace)
Changed:
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/TODO.txt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/__init__.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/configure.zcml
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py
_U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.txt
_U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/logged_in.pt
_U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.pt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.txt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.txt
_U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/__init__.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/authentication.txt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/join.txt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_authentication.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_join.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/TODO.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/TODO.txt 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/TODO.txt 2010-07-02 07:14:03 UTC (rev 114089)
@@ -23,15 +23,15 @@
join_form.py
members_add_control.py -> Join
join_form_template -> templates/join.pt
-
+
[ ] preferences:
preference_form.pt -> preferences.py
personalize.py -> preferences.py
-
+
[ ] password:
-
+
[ ] member roster:
-
+
[ ] complete this todo list
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/TODO.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/__init__.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/__init__.py 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/__init__.py 2010-07-02 07:14:03 UTC (rev 114089)
@@ -11,6 +11,4 @@
#
##############################################################################
"""CMFDefault membership views.
-
-$Id$
"""
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/__init__.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py 2010-07-02 07:14:03 UTC (rev 114089)
@@ -11,8 +11,6 @@
#
##############################################################################
"""Authentication browser views.
-
-$Id$
"""
from urllib import quote, urlencode
@@ -201,15 +199,15 @@
class LoggedIn(ViewBase):
"""Post login methods"""
-
+
template = ViewPageTemplateFile("logged_in.pt")
-
+
def set_skin_cookie(self):
stool = self._getTool('portal_skins')
if stool.updateSkinCookie():
skinname = stool.getSkinNameFromRequest(self.request)
stool.changeSkin(skinname, self.request)
-
+
def first_login(self, member):
"""First time login, reset password"""
utool = self._getTool('portal_url')
@@ -217,7 +215,7 @@
member.setProperties(last_login_time='1999/01/01', login_time=now)
target = '%s/password_form' % utool()
return self.request.response.redirect(target)
-
+
def __call__(self):
self.set_skin_cookie()
mtool = self._getTool('portal_membership')
@@ -288,26 +286,26 @@
class Logout(ViewBase):
"""Log the user out"""
-
+
template = ViewPageTemplateFile("logged_out.pt")
-
+
@memoize
def logged_in(self):
"""Check whether the user is (still logged in)"""
mtool = self._getTool('portal_membership')
return not mtool.isAnonymousUser()
-
+
@memoize
def logout(self):
"""Log the user out"""
_expireAuthCookie(self)
-
+
@memoize
def clear_skin_cookie(self):
"""Remove skin cookie"""
stool = self._getTool('portal_skins')
stool.clearSkinCookie()
-
+
def __call__(self):
"""Clear cookies and return the template"""
if 'portal_status_message' in self.request:
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/configure.zcml 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/configure.zcml 2010-07-02 07:14:03 UTC (rev 114089)
@@ -9,7 +9,7 @@
class=".authentication.LoginFormView"
permission="zope2.View"
/>
-
+
<browser:page
for="Products.CMFCore.interfaces.ISiteRoot"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
@@ -17,7 +17,7 @@
class=".authentication.LoggedIn"
permission="cmf.ModifyPortalContent"
/>
-
+
<browser:page
for="Products.CMFCore.interfaces.ISiteRoot"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
@@ -48,21 +48,21 @@
name="join.html"
class=".join.Join"
permission="zope.Public"
- />
-
+ />
+
<browser:page
for="Products.CMFCore.interfaces.ISiteRoot"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
name="preferences.html"
class=".preferences.Preferences"
permission="cmf.SetOwnProperties"
- />
-
+ />
+
<utility
component=".preferences.portal_skins"
provides="zope.schema.interfaces.IVocabularyFactory"
name="cmf.portal_skins"
- />
+ />
<browser:page
for="Products.CMFCore.interfaces.ISiteRoot"
@@ -70,6 +70,6 @@
name="password.html"
class=".password.Password"
permission="cmf.SetOwnPassword"
- />
+ />
</configure>
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/configure.zcml
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt 2010-07-02 07:14:03 UTC (rev 114089)
@@ -3,19 +3,19 @@
<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
<h1 tal:content="view/title" i18n:translate="">Become a member</h1>
-
+
<tal:case tal:condition="view/isAnon">
<p i18n:translate="">Becoming a member gives you the ability to personalize the site and participate in the community.</p>
<p i18n:translate="">It does not cost any money to become a member and your email and other personal information will remain private.</p>
</tal:case>
-
+
<tal:case tal:condition="view/isOrdinaryMember">
<p i18n:translate=""> You are already a member. You may use the
<a tal:attributes="href view/personalize">personalization form</a>
to change your membership information. </p>
</tal:case>
-
+
<tal:case condition="view/registered">
<p i18n:translate="">You have been registered as a member.</p>
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py 2010-07-02 07:14:03 UTC (rev 114089)
@@ -1,6 +1,17 @@
+#############################################################################
+#
+# Copyright (c) 2010 Zope Foundation and Contributors.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Join form.
"""
-Join form
-"""
from zope.interface import Interface, invariant, Invalid
from zope.schema import ASCIILine, Password, Bool
@@ -15,30 +26,31 @@
class IJoinSchema(Interface):
+
"""Zope generates password and sends it by e-mail"""
-
+
member_id = ASCIILine(
title=_(u"Member ID")
)
-
+
email = EmailLine(
title=_(u"E-mail address")
)
-
+
password = Password(
title=_(u"Password"),
min_length=5
)
-
+
confirmation = Password(
title=_(u"Password (confirm)"),
min_length=5
)
-
+
send_password = Bool(
title=_(u"Mail Password?"),
description=_(u"Check this box to have the password mailed."))
-
+
@invariant
def check_passwords_match(schema):
"""Password and confirmation must match"""
@@ -47,12 +59,12 @@
class Join(EditFormBase):
-
+
base_template = EditFormBase.template
template = ViewPageTemplateFile("join.pt")
registered = False
form_fields = form.FormFields(IJoinSchema)
-
+
actions = form.Actions(
form.Action(
name='register',
@@ -65,7 +77,7 @@
label=_(u'Cancel')
)
)
-
+
def __init__(self, context, request):
super(Join, self).__init__(context, request)
ptool = self._getTool("portal_properties")
@@ -78,11 +90,11 @@
@property
def isAnon(self):
return self.mtool.isAnonymousUser()
-
+
@property
def isManager(self):
return self.mtool.checkPermission(ManageUsers, self.mtool)
-
+
@property
def isOrdinaryMember(self):
return not (self.registered or self.isManager or self.isAnon)
@@ -93,7 +105,7 @@
return _(u"Register a new member")
else:
return _(u'Become a Member')
-
+
def setUpWidgets(self, ignore_request=False):
"""If e-mail validation is in effect, users cannot select passwords"""
super(Join, self).setUpWidgets(ignore_request)
@@ -101,7 +113,7 @@
def personalize(self):
atool = self._getTool('portal_actions')
return atool.getActionInfo("user/preferences")['url']
-
+
def validate_username(self, action, data):
"""Avoid duplicate registration"""
errors = super(Join, self).validate(action, data)
@@ -124,7 +136,7 @@
self.rtool.registeredNotify(data['member_id'])
self.registered = True
self.label = _(u'Success')
-
+
def handle_register_success(self, action, data):
"""Register user and inform they have been registered"""
if self.validate_email:
@@ -132,4 +144,4 @@
self.add_member(data)
self.status = _(u'You have been registered as a member.')
if not self.validate_email:
- self._setRedirect('portal_actions', 'user/login')
\ No newline at end of file
+ self._setRedirect('portal_actions', 'user/login')
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/logged_in.pt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.pt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.py 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.py 2010-07-02 07:14:03 UTC (rev 114089)
@@ -1,6 +1,17 @@
+##############################################################################
+#
+# Copyright (c) 2010 Zope Foundation and Contributors.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Change password form.
"""
-Change password form
-"""
from DateTime import DateTime
@@ -21,7 +32,7 @@
class IPasswordSchema(Interface):
-
+
password = Password(
title=_(u"New password"),
min_length=5,
@@ -32,7 +43,7 @@
title=_(u"Confirm new password"),
required=False
)
-
+
domains = List(
title=_("Domains"),
description=_(u"""If you do not know what this field is
@@ -43,18 +54,18 @@
),
required = False
)
-
+
@invariant
def check_passwords_match(schema):
"""Password and confirmation must match"""
if schema.password != schema.confirmation:
raise Invalid(_(u"Passwords do not match"))
-
+
class Password(EditFormBase):
-
+
form_fields = form.FormFields(IPasswordSchema)
-
+
actions = form.Actions(
form.Action(
name="change",
@@ -63,17 +74,17 @@
failure="handle_failure"
)
)
-
+
template = ViewPageTemplateFile("password.pt")
base_template = EditFormBase.template
-
+
def __init__(self, context, request):
super(Password, self).__init__(context, request)
self.mtool = getToolByName(self.context, 'portal_membership')
self.rtool = getToolByName(self.context, 'portal_registration')
if self.member.getProperty('last_login_time') == DateTime('1999/01/01'):
self.member.setProperties(last_login_time='2000/01/01')
-
+
def setUpWidgets(self, ignore_request=False):
"""Populate form with user domains"""
data = {}
@@ -85,15 +96,15 @@
self.request,
data=data,
ignore_request=ignore_request)
-
+
@property
def member(self):
return self.mtool.getAuthenticatedMember()
-
+
@property
def is_first_login(self):
return self.member.getProperty('last_login_time') == DateTime('1999/01/01')
-
+
def handle_success(self, action, data):
data.pop("confirmation")
self.member.setSecurityProfile(**data)
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.txt 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.txt 2010-07-02 07:14:03 UTC (rev 114089)
@@ -4,4 +4,4 @@
Apply same constraints as when joining
Uses that have been sent a password must change it using this form the first time they log in
-Once the password has been changed the user must login again
\ No newline at end of file
+Once the password has been changed the user must login again
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py 2010-07-02 07:14:03 UTC (rev 114089)
@@ -1,7 +1,17 @@
+##############################################################################
+#
+# Copyright (c) 2010 Zope Foundation and Contributors.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Change user preferences.
"""
-Change user preferences
-$Id$
-"""
from zope.schema import Choice, Bool
from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
@@ -19,10 +29,10 @@
def portal_skins(context):
stool = getToolByName(context, 'portal_skins')
return SimpleVocabulary.fromValues(stool.getSkinSelections())
-
+
class IPreferencesSchema(Interface):
-
+
email = EmailLine(
title=_(u"E-mail address")
)
@@ -31,7 +41,7 @@
title=_(u"Listed status"),
description=_(u"Select to be listed on the public membership roster.")
)
-
+
portal_skin = Choice(
title=_(u"Skin"),
vocabulary="cmf.portal_skins",
@@ -41,7 +51,7 @@
class Preferences(EditFormBase):
form_fields = form.FormFields(IPreferencesSchema)
-
+
actions = form.Actions(
form.Action(
name="change",
@@ -51,13 +61,13 @@
)
)
label = _(u"Member preferences")
-
+
def __init__(self, context, request):
super(Preferences, self).__init__(context, request)
self.mtool = self._getTool('portal_membership')
self.stool = self._getTool('portal_skins')
self.atool = self._getTool('portal_actions')
-
+
def get_skin_cookie(self):
"""Check for user cookie"""
cookies = self.request.cookies
@@ -67,23 +77,23 @@
def member(self):
"""Get the current user"""
return self.mtool.getAuthenticatedMember()
-
+
def setUpWidgets(self, ignore_request=False):
"""Populate form with member preferences"""
data = {}
data['email'] = self.member.email
data['listed'] = getattr(self.member, 'listed', None)
data['portal_skin'] = self.get_skin_cookie()
-
+
self.widgets = form.setUpDataWidgets(self.form_fields,
self.prefix,
self.context,
self.request,
data=data,
ignore_request=False)
-
+
def handle_success(self, action, data):
if 'portal_skin' in data:
self.stool.portal_skins.updateSkinCookie()
self.member.setProperties(data)
- self.label = _(u"Member changed.")
\ No newline at end of file
+ self.label = _(u"Member changed.")
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.txt 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.txt 2010-07-02 07:14:03 UTC (rev 114089)
@@ -7,4 +7,4 @@
Listed or unlisted
User's chosen skin if set
-The preferences form contains a link to password change form
\ No newline at end of file
+The preferences form contains a link to password change form
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/__init__.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/authentication.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/authentication.txt 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/authentication.txt 2010-07-02 07:14:03 UTC (rev 114089)
@@ -164,4 +164,4 @@
>>> browser.cookies['__ac'] = '%s' % mbr_credentials
>>> browser.open('http://localhost/site/@@logout.html')
>>> '[[cmf_default][You are logged in outside the portal' in browser.contents
- True
\ No newline at end of file
+ True
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/join.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/join.txt 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/join.txt 2010-07-02 07:14:03 UTC (rev 114089)
@@ -11,7 +11,7 @@
>>> browser = Browser()
Set properties to validation not required.
-
+
>>> from zope.component import getSiteManager
>>> from Products.CMFCore.interfaces import IPropertiesTool
>>> sm = getSiteManager()
@@ -23,4 +23,4 @@
>>> browser.open("http://localhost/site/@@join.html")
>>> browser.getControl(name='form.password').value == ''
- True
\ No newline at end of file
+ True
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/join.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_authentication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_authentication.py 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_authentication.py 2010-07-02 07:14:03 UTC (rev 114089)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Test Products.CMFDefault.browser.authentication
-
-$Id$
"""
import unittest
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_authentication.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_join.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_join.py 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_join.py 2010-07-02 07:14:03 UTC (rev 114089)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Test Products.CMFDefault.browser.join
-
-$Id$
"""
import unittest
@@ -25,13 +23,13 @@
)
class JoinFormTests(unittest.TestCase, PlacelessSetup):
-
+
def setUp(self):
PlacelessSetup.setUp(self)
def tearDown(self):
PlacelessSetup.tearDown(self)
-
+
def _getTargetClass(self):
from Products.CMFDefault.browser.membership.join import Join
return Join
@@ -41,7 +39,7 @@
site = self._makeSite()
request = DummyRequest()
return self._getTargetClass()(site, request)
-
+
def _makeSite(self,):
from zope.component import getSiteManager
from Products.CMFCore.interfaces import IPropertiesTool
@@ -55,38 +53,38 @@
site.portal_actions = DummyActionsTool()
site.absolute_url = lambda: 'http://example.com'
return site
-
+
def test_validation_not_required(self):
site = self._makeSite()
site.portal_properties.validate_email = False
view = self._makeOne(site)
self.assertTrue(view.form_fields.get("password"))
-
+
def test_validation_required(self):
site = self._makeSite()
site.portal_properties.validate_email = True
view = self._makeOne(site)
self.assertEqual(view.form_fields.get("password"), None)
-
+
def test_logged_in_user(self):
# logged in users cannot join
# they get to see the preferences
pass
-
+
def test_successful_registration_validation_not_required(self):
# can proceed straight to login
pass
-
+
def test_successful_registration_validation_required(self):
- # note that password will be sent by e-mail
+ # note that password will be sent by e-mail
pass
-
+
class DummyRegistrationTool:
pass
class DummyMembershipTool:
pass
-
+
class DummyActionsTool:
- pass
\ No newline at end of file
+ pass
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_join.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py 2010-07-02 07:10:49 UTC (rev 114088)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py 2010-07-02 07:14:03 UTC (rev 114089)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Test Products.CMFDefault.browser.preferences
-
-$Id$
"""
import unittest
@@ -25,13 +23,13 @@
)
class PreferencesFormTests(unittest.TestCase, PlacelessSetup):
-
+
def setUp(self):
PlacelessSetup.setUp(self)
def tearDown(self):
PlacelessSetup.tearDown(self)
-
+
def _getTargetClass(self):
from Products.CMFDefault.browser.membership.join import Join
return Join
@@ -41,7 +39,7 @@
site = self._makeSite()
request = DummyRequest()
return self._getTargetClass()(site, request)
-
+
def _makeSite(self,):
from zope.component import getSiteManager
from Products.CMFCore.interfaces import IPropertiesTool
@@ -55,12 +53,12 @@
site.portal_actions = DummyActionsTool()
site.absolute_url = lambda: 'http://example.com'
return site
-
+
def test_user_folder(self):
site = self._makeSite()
view = self._makeOne(site)
-
+
class DummyRegistrationTool:
pass
@@ -74,4 +72,4 @@
class DummySkinsTool:
- pass
\ No newline at end of file
+ pass
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py
___________________________________________________________________
Deleted: svn:keywords
- Id
More information about the checkins
mailing list