kallithea Changeset - 3e04256f8e3c

Changeset - 3e04256f8e3c

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Konstantin Veretennicov - 9 years ago 2016-06-15 23:49:19
kveretennicov@gmail.com

tests: cleanup test users

1 file changed with 19 insertions and 13 deletions:

kallithea/tests/functional/test_admin_notifications.py

0 comments (0 inline, 0 general)

kallithea/tests/functional/test_admin_notifications.py

➞

Show inline comments

@@ @@ -8,18 +8,19 @@ from kallithea.lib import helpers as h @@
 class TestNotificationsController(TestController):
     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',
+        u1 = create_test_user(dict(username='u1', password='qweqwe',
                                           email='u1@example.com',
                                           firstname=u'u1', lastname=u'u1')
                                    firstname=u'u1', lastname=u'u1',
                                    active=True))
         u1 = u1.user_id
         Session().commit()
         response = self.app.get(url('notifications'))
         response.mustcontain('<div class="table">No notifications here yet</div>')
@@ @@ -27,22 +28,24 @@ class TestNotificationsController(TestCo @@
         notif = NotificationModel().create(created_by=u1, subject=u'test_notification_1',
                                            body=u'notification_1', recipients=[cur_user])
         Session().commit()
         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',
+        u1 = create_test_user(dict(username='u1', password='qweqwe',
                                                email='u1@example.com',
                                                firstname=u'u1', lastname=u'u1')
         u2 = UserModel().create_or_update(username='u2', password='qweqwe',
                                    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')
                                    firstname=u'u2', lastname=u'u2',
                                    active=True))
         # make notifications
         notification = NotificationModel().create(created_by=cur_user,
                                                   subject=u'test',
                                                   body=u'hi there',
                                                   recipients=[cur_user, u1, u2])
@@ @@ -62,21 +65,24 @@ class TestNotificationsController(TestCo @@
             params={'_method': 'delete', '_authentication_token': self.authentication_token()})
         assert response.body == 'ok'
         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',
+        u1 = create_test_user(dict(username='u1', password='qweqwe',
                                           email='u1@example.com',
                                           firstname=u'u1', lastname=u'u1')
         u2 = UserModel().create_or_update(username='u2', password='qweqwe',
                                    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')
                                    firstname=u'u2', lastname=u'u2',
                                    active=True))
         Session().commit()
         subject = u'test'
         notif_body = u'hi there'
         notification = NotificationModel().create(created_by=cur_user,
                                                   subject=subject,
                                                   body=notif_body,

0 comments (0 inline, 0 general)