diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2013-03-30 16:17:56 +0100 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2013-03-30 16:17:56 +0100 |
| commit | 9df1392b28e519ff2b010abff2a8e355d73f4924 (patch) | |
| tree | cee8c17aca6f8585c75e8b85aabe2c52bb8e6e65 /rhodecode/tests | |
| parent | a74f5f23bcbe371eb9f40eb9479eab68d2013ea2 (diff) | |
unified flash msg tests
--HG--
branch : beta
Diffstat (limited to 'rhodecode/tests')
| -rw-r--r-- | rhodecode/tests/functional/test_admin_repos.py | 6 | ||||
| -rw-r--r-- | rhodecode/tests/functional/test_admin_settings.py | 3 | ||||
| -rw-r--r-- | rhodecode/tests/functional/test_admin_users.py | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/rhodecode/tests/functional/test_admin_repos.py b/rhodecode/tests/functional/test_admin_repos.py index 3ad98d45..0ccb8a1d 100644 --- a/rhodecode/tests/functional/test_admin_repos.py +++ b/rhodecode/tests/functional/test_admin_repos.py @@ -251,8 +251,7 @@ class TestAdminReposController(TestController): 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 @@ class TestAdminReposController(TestController): 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() diff --git a/rhodecode/tests/functional/test_admin_settings.py b/rhodecode/tests/functional/test_admin_settings.py index c4f72d98..c7dfdfa3 100644 --- a/rhodecode/tests/functional/test_admin_settings.py +++ b/rhodecode/tests/functional/test_admin_settings.py @@ -85,8 +85,7 @@ class TestAdminSettingsController(TestController): 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) diff --git a/rhodecode/tests/functional/test_admin_users.py b/rhodecode/tests/functional/test_admin_users.py index 4d7a7322..0e25ac6e 100644 --- a/rhodecode/tests/functional/test_admin_users.py +++ b/rhodecode/tests/functional/test_admin_users.py @@ -150,8 +150,7 @@ class TestAdminUsersController(TestController): .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), |