Commit: 827559e6dd70da01095e3e7d814892f3f505bab1 - allura (git)

allura

Commit MetaInfo

• Revisão: 827559e6dd70da01095e3e7d814892f3f505bab1 (tree)
• Hora: 2012-05-04 02:22:14
• Autor: Dave Brondsema <dbrondsema@geek...>
• Commiter: Yaroslav Luzin

Mensagem de Log

[#4103] set c.user in @td.with_user_project; other test fixes

Mudança Sumário

• modified: Allura/allura/tests/decorators.py
• modified: Allura/allura/tests/functional/test_auth.py

Diff

--- a/Allura/allura/tests/decorators.py
+++ b/Allura/allura/tests/decorators.py
@@ -11,6 +11,7 @@ def with_user_project(username):
         @wraps(func)
         def wrapped(*args, **kw):
             user = M.User.by_username(username)
+            c.user = user
             n = M.Neighborhood.query.get(name='Users')
             shortname = 'u/' + username
             p = M.Project.query.get(shortname=shortname, neighborhood_id=n._id)

--- a/Allura/allura/tests/functional/test_auth.py
+++ b/Allura/allura/tests/functional/test_auth.py
@@ -36,11 +36,10 @@ class TestAuth(TestController):
 
     @td.with_user_project('test-admin')
     def test_prefs(self):
-        r = self.app.get('/auth/prefs/')
+        r = self.app.get('/auth/prefs/', extra_environ=dict(username='test-admin'))
         assert '[e-mail]' not in r
-        mailboxes = M.Mailbox.query.find(dict(user_id=c.user._id, is_flash=False))
+        subscriptions = M.Mailbox.query.find(dict(user_id=c.user._id, is_flash=False)).all()
         # make sure page actually lists all the user's subscriptions
-        subscriptions = list(mailboxes.ming_cursor)
         assert len(subscriptions) > 0, 'Test user has no subscriptions, cannot verify that they are shown'
         for m in subscriptions:
             assert m._id in r, "Page doesn't list subscription for Mailbox._id = %s" % m._id
@@ -48,8 +47,9 @@ class TestAuth(TestController):
                  'display_name':'Test Admin',
                  'new_addr.addr':'[e-mail]',
                  'new_addr.claim':'Claim Address',
-                 'primary_addr':'[e-mail]',
-                 'preferences.email_format':'plain'})
+                 'primary_addr':'[e-mail]',
+                 'preferences.email_format':'plain'},
+                extra_environ=dict(username='test-admin'))
         r = self.app.get('/auth/prefs/')
         assert '[e-mail]' in r
         r = self.app.post('/auth/prefs/update', params={
@@ -58,19 +58,21 @@ class TestAuth(TestController):
                  'addr-2.ord':'1',
                  'addr-2.delete':'on',
                  'new_addr.addr':'',
-                 'primary_addr':'[e-mail]',
-                 'preferences.email_format':'plain'})
+                 'primary_addr':'[e-mail]',
+                 'preferences.email_format':'plain'},
+                extra_environ=dict(username='test-admin'))
         r = self.app.get('/auth/prefs/')
         assert '[e-mail]' not in r
-        ea = M.EmailAddress.query.get(_id='[e-mail]')
+        ea = M.EmailAddress.query.get(_id='[e-mail]')
         ea.confirmed = True
         ThreadLocalORMSession.flush_all()
         r = self.app.post('/auth/prefs/update', params={
                  'display_name':'Test Admin',
-                 'new_addr.addr':'[e-mail]',
+                 'new_addr.addr':'[e-mail]',
                  'new_addr.claim':'Claim Address',
-                 'primary_addr':'[e-mail]',
-                 'preferences.email_format':'plain'})
+                 'primary_addr':'[e-mail]',
+                 'preferences.email_format':'plain'},
+                extra_environ=dict(username='test-admin'))
 
     def test_api_key(self):
          r = self.app.get('/auth/prefs/')