diff rhodecode/tests/__init__.py @ 1712:cac5109ac3b6 beta

Notification system improvements - deleting - tests - ui - moved to separate controller
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 23 Nov 2011 00:55:05 +0200
parents 54fda6ce9e98
children 54687aa00724
line wrap: on
line diff
--- a/rhodecode/tests/__init__.py	Tue Nov 22 14:10:33 2011 +0200
+++ b/rhodecode/tests/__init__.py	Wed Nov 23 00:55:05 2011 +0200
@@ -9,6 +9,7 @@
 """
 import os
 import time
+import logging
 from os.path import join as jn
 
 from unittest import TestCase
@@ -20,7 +21,8 @@
 from webtest import TestApp
 
 from rhodecode.model import meta
-import logging
+from rhodecode.model.db import User
+
 import pylons.test
 
 os.environ['TZ'] = 'UTC'
@@ -68,10 +70,11 @@
 
     def log_user(self, username=TEST_USER_ADMIN_LOGIN,
                  password=TEST_USER_ADMIN_PASS):
+        self._logged_username = username
         response = self.app.post(url(controller='login', action='index'),
                                  {'username':username,
                                   'password':password})
-        
+
         if 'invalid user name' in response.body:
             self.fail('could not login using %s %s' % (username, password))
 
@@ -79,6 +82,10 @@
         self.assertEqual(response.session['rhodecode_user'].username, username)
         return response.follow()
 
+    def _get_logged_user(self):
+        return User.get_by_username(self._logged_username)
+
+
     def checkSessionFlash(self, response, msg):
         self.assertTrue('flash' in response.session)
         self.assertTrue(msg in response.session['flash'][0][1])