Mercurial > kallithea

changeset 5977:3e04256f8e3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: cleanup test users
author Konstantin Veretennicov <kveretennicov@gmail.com>
date Wed, 15 Jun 2016 23:49:19 +0200
parents 769e86868c6c
children 97bbc2824b32
files kallithea/tests/functional/test_admin_notifications.py
diffstat 1 files changed, 24 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/tests/functional/test_admin_notifications.py	Wed Jun 15 23:36:29 2016 +0200
+++ b/kallithea/tests/functional/test_admin_notifications.py	Wed Jun 15 23:49:19 2016 +0200
@@ -11,12 +11,13 @@
     def setup_method(self, method):
         self.remove_all_notifications()
 
-    def test_index(self):
+    def test_index(self, create_test_user):
         self.log_user()
 
-        u1 = UserModel().create_or_update(username='u1', password='qweqwe',
-                                          email='u1@example.com',
-                                          firstname=u'u1', lastname=u'u1')
+        u1 = create_test_user(dict(username='u1', password='qweqwe',
+                                   email='u1@example.com',
+                                   firstname=u'u1', lastname=u'u1',
+                                   active=True))
         u1 = u1.user_id
         Session().commit()
 
@@ -30,16 +31,18 @@
         response = self.app.get(url('notifications'))
         response.mustcontain('id="notification_%s"' % notif.notification_id)
 
-    def test_delete(self):
+    def test_delete(self, create_test_user):
         self.log_user()
         cur_user = self._get_logged_user()
 
-        u1 = UserModel().create_or_update(username='u1', password='qweqwe',
-                                               email='u1@example.com',
-                                               firstname=u'u1', lastname=u'u1')
-        u2 = UserModel().create_or_update(username='u2', password='qweqwe',
-                                               email='u2@example.com',
-                                               firstname=u'u2', lastname=u'u2')
+        u1 = create_test_user(dict(username='u1', password='qweqwe',
+                                   email='u1@example.com',
+                                   firstname=u'u1', lastname=u'u1',
+                                   active=True))
+        u2 = create_test_user(dict(username='u2', password='qweqwe',
+                                   email='u2@example.com',
+                                   firstname=u'u2', lastname=u'u2',
+                                   active=True))
 
         # make notifications
         notification = NotificationModel().create(created_by=cur_user,
@@ -65,15 +68,18 @@
         cur_user = User.get(cur_usr_id)
         assert cur_user.notifications == []
 
-    def test_show(self):
+    def test_show(self, create_test_user):
         self.log_user()
         cur_user = self._get_logged_user()
-        u1 = UserModel().create_or_update(username='u1', password='qweqwe',
-                                          email='u1@example.com',
-                                          firstname=u'u1', lastname=u'u1')
-        u2 = UserModel().create_or_update(username='u2', password='qweqwe',
-                                          email='u2@example.com',
-                                          firstname=u'u2', lastname=u'u2')
+        u1 = create_test_user(dict(username='u1', password='qweqwe',
+                                   email='u1@example.com',
+                                   firstname=u'u1', lastname=u'u1',
+                                   active=True))
+        u2 = create_test_user(dict(username='u2', password='qweqwe',
+                                   email='u2@example.com',
+                                   firstname=u'u2', lastname=u'u2',
+                                   active=True))
+        Session().commit()
 
         subject = u'test'
         notif_body = u'hi there'