Mercurial > kallithea

changeset 3640:4f80df0d45c8 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unified flash msg tests
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 30 Mar 2013 16:17:56 +0100
parents 2f5816720f82
children b44979649915
files rhodecode/tests/functional/test_admin_repos.py rhodecode/tests/functional/test_admin_settings.py rhodecode/tests/functional/test_admin_users.py
diffstat 3 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/tests/functional/test_admin_repos.py	Sat Mar 30 12:22:07 2013 +0100
+++ b/rhodecode/tests/functional/test_admin_repos.py	Sat Mar 30 16:17:56 2013 +0100
@@ -251,8 +251,7 @@
 
         response = self.app.delete(url('repo', repo_name=repo_name))
 
-        self.assertTrue('''Deleted repository %s''' % (repo_name) in
-                        response.session['flash'][0])
+        self.checkSessionFlash(response, 'Deleted repository %s' % (repo_name))
 
         response.follow()
 
@@ -299,8 +298,7 @@
 
         response = self.app.delete(url('repo', repo_name=repo_name))
 
-        self.assertTrue('''Deleted repository %s''' % (repo_name) in
-                        response.session['flash'][0])
+        self.checkSessionFlash(response, 'Deleted repository %s' % (repo_name))
 
         response.follow()
 
--- a/rhodecode/tests/functional/test_admin_settings.py	Sat Mar 30 12:22:07 2013 +0100
+++ b/rhodecode/tests/functional/test_admin_settings.py	Sat Mar 30 16:17:56 2013 +0100
@@ -85,8 +85,7 @@
                                                  rhodecode_ga_code=new_ga_code
                                                  ))
 
-        self.assertTrue('Updated application settings' in
-                        response.session['flash'][0][1])
+        self.checkSessionFlash(response, 'Updated application settings')
         self.assertEqual(RhodeCodeSetting
                         .get_app_settings()['rhodecode_ga_code'], new_ga_code)
 
--- a/rhodecode/tests/functional/test_admin_users.py	Sat Mar 30 12:22:07 2013 +0100
+++ b/rhodecode/tests/functional/test_admin_users.py	Sat Mar 30 16:17:56 2013 +0100
@@ -150,8 +150,7 @@
             .filter(User.username == username).one()
         response = self.app.delete(url('user', id=new_user.user_id))
 
-        self.assertTrue("""Successfully deleted user""" in
-                        response.session['flash'][0])
+        self.checkSessionFlash(response, 'Successfully deleted user')
 
     def test_delete_browser_fakeout(self):
         response = self.app.post(url('user', id=1),