Mercurial > kallithea
changeset 1382:c310e1e1e757 beta
Added CheckSessionFlash into init.
Added repo_groups_test controller.
Renamed users_groups test controller
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 14 Jun 2011 09:38:23 +0200 |
parents | a1ab3e9c7e82 |
children | 95e6a005630c |
files | rhodecode/tests/__init__.py rhodecode/tests/functional/test_admin_repos_groups.py rhodecode/tests/functional/test_admin_settings.py rhodecode/tests/functional/test_admin_users_groups.py rhodecode/tests/functional/test_users_groups.py |
diffstat | 5 files changed, 88 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/tests/__init__.py Mon Jun 13 18:04:42 2011 +0200 +++ b/rhodecode/tests/__init__.py Tue Jun 14 09:38:23 2011 +0200 @@ -27,7 +27,8 @@ import pylons.test __all__ = ['environ', 'url', 'TestController', 'TESTS_TMP_PATH', 'HG_REPO', - 'GIT_REPO', 'NEW_HG_REPO', 'NEW_GIT_REPO', 'HG_FORK', 'GIT_FORK', ] + 'GIT_REPO', 'NEW_HG_REPO', 'NEW_GIT_REPO', 'HG_FORK', 'GIT_FORK', + 'checkSessionFlash' ] # Invoke websetup with the current config file #SetupCommand('setup-app').run([config_file]) @@ -72,3 +73,10 @@ self.assertEqual(response.status, '302 Found') self.assertEqual(response.session['rhodecode_user'].username, username) return response.follow() + + + + def checkSessionFlash(self, response, msg): + self.assertTrue('flash' in response.session) + self.assertTrue(msg in response.session['flash'][0][1]) +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rhodecode/tests/functional/test_admin_repos_groups.py Tue Jun 14 09:38:23 2011 +0200 @@ -0,0 +1,4 @@ +from rhodecode.tests import * + +class TestReposGroupsController(TestController): + pass
--- a/rhodecode/tests/functional/test_admin_settings.py Mon Jun 13 18:04:42 2011 +0200 +++ b/rhodecode/tests/functional/test_admin_settings.py Tue Jun 14 09:38:23 2011 +0200 @@ -61,8 +61,8 @@ 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(RhodeCodeSettings .get_app_settings()['rhodecode_ga_code'], new_ga_code) @@ -108,9 +108,7 @@ rhodecode_ga_code='' )) - - self.assertTrue('Updated application settings' in - response.session['flash'][0][1]) + self.checkSessionFlash(response, 'Updated application settings') self.assertEqual(RhodeCodeSettings .get_app_settings()['rhodecode_title'], new_title.decode('utf-8')) @@ -168,7 +166,9 @@ email=old_email,)) response.follow() - assert 'Your account was updated successfully' in response.session['flash'][0][1], 'no flash message about success of change' + self.checkSessionFlash(response, + 'Your account was updated successfully') + user = self.sa.query(User).filter(User.username == 'test_admin').one() assert user.email == old_email , 'incorrect user email after update got %s vs %s' % (user.email, old_email)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rhodecode/tests/functional/test_admin_users_groups.py Tue Jun 14 09:38:23 2011 +0200 @@ -0,0 +1,69 @@ +from rhodecode.tests import * + +TEST_USERS_GROUP = 'admins_test' + +class TestAdminUsersGroupsController(TestController): + + def test_index(self): + response = self.app.get(url('users_groups')) + # Test response... + + def test_index_as_xml(self): + response = self.app.get(url('formatted_users_groups', format='xml')) + + def test_create(self): + users_group_name = TEST_USERS_GROUP + response = self.app.post(url('users_groups'), + {'users_group_name':users_group_name, + 'active':True}) + response.follow() + + self.checkSessionFlash(response, + 'created users group %s' % TEST_USERS_GROUP) + + + + + + def test_new(self): + response = self.app.get(url('new_users_group')) + + def test_new_as_xml(self): + response = self.app.get(url('formatted_new_users_group', format='xml')) + + def test_update(self): + response = self.app.put(url('users_group', id=1)) + + def test_update_browser_fakeout(self): + response = self.app.post(url('users_group', id=1), params=dict(_method='put')) + + def test_delete(self): + response = self.app.delete(url('users_group', id=1)) + + def test_delete_browser_fakeout(self): + response = self.app.post(url('users_group', id=1), params=dict(_method='delete')) + + def test_show(self): + response = self.app.get(url('users_group', id=1)) + + def test_show_as_xml(self): + response = self.app.get(url('formatted_users_group', id=1, format='xml')) + + def test_edit(self): + response = self.app.get(url('edit_users_group', id=1)) + + def test_edit_as_xml(self): + response = self.app.get(url('formatted_edit_users_group', id=1, format='xml')) + + def test_assign_members(self): + pass + + def test_add_create_permission(self): + pass + + def test_revoke_members(self): + pass + + + +
--- a/rhodecode/tests/functional/test_users_groups.py Mon Jun 13 18:04:42 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -from rhodecode.tests import * - -class TestUsersGroupsController(TestController): - - def test_index(self): - response = self.app.get(url('users_groups')) - # Test response... - - def test_index_as_xml(self): - response = self.app.get(url('formatted_users_groups', format='xml')) - - def test_create(self): - response = self.app.post(url('users_groups')) - - def test_new(self): - response = self.app.get(url('new_users_group')) - - def test_new_as_xml(self): - response = self.app.get(url('formatted_new_users_group', format='xml')) - - def test_update(self): - response = self.app.put(url('users_group', id=1)) - - def test_update_browser_fakeout(self): - response = self.app.post(url('users_group', id=1), params=dict(_method='put')) - - def test_delete(self): - response = self.app.delete(url('users_group', id=1)) - - def test_delete_browser_fakeout(self): - response = self.app.post(url('users_group', id=1), params=dict(_method='delete')) - - def test_show(self): - response = self.app.get(url('users_group', id=1)) - - def test_show_as_xml(self): - response = self.app.get(url('formatted_users_group', id=1, format='xml')) - - def test_edit(self): - response = self.app.get(url('edit_users_group', id=1)) - - def test_edit_as_xml(self): - response = self.app.get(url('formatted_edit_users_group', id=1, format='xml'))