[Checkins] SVN: grokapps/LoginDemo/src/logindemo/ changed password manager to SHA1, added test for e-mail in listing

Luciano Ramalho luciano at ramalho.org
Wed Jan 2 00:18:35 EST 2008


Log message for revision 82635:
  changed password manager to SHA1, added test for e-mail in listing
  

Changed:
  U   grokapps/LoginDemo/src/logindemo/app.py
  U   grokapps/LoginDemo/src/logindemo/ftests/join.txt
  U   grokapps/LoginDemo/src/logindemo/ftests/test_functional.py

-=-
Modified: grokapps/LoginDemo/src/logindemo/app.py
===================================================================
--- grokapps/LoginDemo/src/logindemo/app.py	2008-01-02 02:20:17 UTC (rev 82634)
+++ grokapps/LoginDemo/src/logindemo/app.py	2008-01-02 05:18:34 UTC (rev 82635)
@@ -105,7 +105,8 @@
             msg = _(u'Duplicate login. Please choose a different one.')
             self.redirect(self.url()+'?'+urlencode({'error_msg':msg}))
         else:
-            principal = InternalPrincipal(login, data['password'], data['name'])
+            principal = InternalPrincipal(login, data['password'], data['name'],
+                                          passwordManagerName='SHA1')
             # add principal to principal folder
             principals[login] = principal
             # save the e-mail
@@ -127,7 +128,7 @@
     grok.require('logindemo.ViewMemberListing')
 
     def fieldNames(self):
-        return ['id'] + [f for f in IUser]
+        return (f for f in IUser)
 
     def members(self):
         pau = getUtility(IAuthentication)
@@ -138,6 +139,5 @@
             fields = {}
             for field in IUser:
                 fields[field] = getattr(user, field)
-            fields['id'] = id
             roster.append(fields)
         return roster

Modified: grokapps/LoginDemo/src/logindemo/ftests/join.txt
===================================================================
--- grokapps/LoginDemo/src/logindemo/ftests/join.txt	2008-01-02 02:20:17 UTC (rev 82634)
+++ grokapps/LoginDemo/src/logindemo/ftests/join.txt	2008-01-02 05:18:34 UTC (rev 82635)
@@ -21,6 +21,7 @@
     >>> browser.getControl(name='form.login').value = 'naoh'
     >>> browser.getControl(name='form.password').value = 'atra'
     >>> browser.getControl(name='form.name').value = 'Naoh'
+    >>> browser.getControl(name='form.email').value = 'naoh at gnufix.de'
     >>> browser.getControl('Save').click()
     
 This redirects to the login form again. The login name is filled in, so we
@@ -65,5 +66,5 @@
 Now we can see that our name is in the list::
 
     >>> browser.contents
-    '...<td...>naoh</td>...<td...>Naoh</td>...'
+    '...<td...>naoh</td>...<td...>Naoh</td>...<td...>naoh at gnufix.de</td>...'
     

Modified: grokapps/LoginDemo/src/logindemo/ftests/test_functional.py
===================================================================
--- grokapps/LoginDemo/src/logindemo/ftests/test_functional.py	2008-01-02 02:20:17 UTC (rev 82634)
+++ grokapps/LoginDemo/src/logindemo/ftests/test_functional.py	2008-01-02 05:18:34 UTC (rev 82635)
@@ -8,7 +8,7 @@
 import zope.testbrowser.testing
 
 ftesting_zcml = os.path.join(os.path.dirname(logindemo.__file__), 'ftesting.zcml')
-TestedSampleFunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'TestedSampleFunctionalLayer')
+LoginDemoFunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'TestedSampleFunctionalLayer')
 
 def test_suite():
     suite = unittest.TestSuite()
@@ -21,7 +21,7 @@
              optionflags = (doctest.ELLIPSIS
                             | doctest.REPORT_NDIFF
                             | doctest.NORMALIZE_WHITESPACE),)
-        test.layer = TestedSampleFunctionalLayer
+        test.layer = LoginDemoFunctionalLayer
         suite.addTest(test)
 
     return suite



More information about the Checkins mailing list