kallithea Changeset - 8321b3d19b1f

Changeset - 8321b3d19b1f

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2011-11-26 20:50:08
marcin@python-works.com

test fixes

3 files changed with 15 insertions and 5 deletions:

rhodecode/model/notification.py

rhodecode/tests/functional/test_forks.py

rhodecode/tests/functional/test_login.py

0 comments (0 inline, 0 general)

rhodecode/model/notification.py

➞

Show inline comments

@@ @@ -178,15 +178,15 @@ class NotificationModel(BaseModel): @@
                     when=when)
         return tmpl % data
 class EmailNotificationModel(BaseModel):
-    TYPE_CHANGESET_COMMENT = 'changeset_comment'
+    TYPE_CHANGESET_COMMENT = Notification.TYPE_CHANGESET_COMMENT
     TYPE_PASSWORD_RESET = 'passoword_link'
-    TYPE_REGISTRATION = 'registration'
+    TYPE_REGISTRATION = Notification.TYPE_REGISTRATION
     TYPE_DEFAULT = 'default'
     def __init__(self):
         self._template_root = rhodecode.CONFIG['pylons.paths']['templates'][0]
         self._tmpl_lookup = rhodecode.CONFIG['pylons.app_globals'].mako_lookup
@@ @@ -201,13 +201,13 @@ class EmailNotificationModel(BaseModel): @@
         """
         return generated template for email based on given type
         :param type_:
         """
         base = self.email_types.get(type_, self.TYPE_DEFAULT)
+        base = self.email_types.get(type_, self.email_types[self.TYPE_DEFAULT])
         email_template = self._tmpl_lookup.get_template(base)
         # translator inject
         _kwargs = {'_':_}
         _kwargs.update(kwargs)
         log.debug('rendering tmpl %s with kwargs %s' % (base, _kwargs))
         return email_template.render(**_kwargs)

rhodecode/tests/functional/test_forks.py

➞

Show inline comments

@@ @@ -74,10 +74,13 @@ class TestForksController(TestController @@
         #test if fork is visible in the list ?
         response = response.follow()
         #check if fork is marked as fork
         # wait for cache to expire
         import time
         time.sleep(10)
         response = self.app.get(url(controller='summary', action='index',
                                     repo_name=fork_name))
         self.assertTrue('Fork of %s' % repo_name in response.body)

rhodecode/tests/functional/test_login.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 from rhodecode.tests import *
 from rhodecode.model.db import User
+from rhodecode.model.db import User, Notification
 from rhodecode.lib import generate_api_key
 from rhodecode.lib.auth import check_password
+from rhodecode.model.meta import Session
 class TestLoginController(TestController):
     def tearDown(self):
         for n in Notification.query().all():
             Session().delete(n)
         Session().commit()
         self.assertEqual(Notification.query().all(), [])
     def test_index(self):
         response = self.app.get(url(controller='login', action='index'))
         self.assertEqual(response.status, '200 OK')
         # Test response...
     def test_login_admin_ok(self):

0 comments (0 inline, 0 general)