Changeset - c310e1e1e757
[Not reviewed]
beta
1 2 2
Marcin Kuzminski - 14 years ago 2011-06-14 09:38:23
marcin@python-works.com
Added CheckSessionFlash into init.
Added repo_groups_test controller.
Renamed users_groups test controller
4 files changed with 47 insertions and 9 deletions:
0 comments (0 inline, 0 general)
rhodecode/tests/__init__.py
Show inline comments
 
@@ -27,7 +27,8 @@ log = logging.getLogger(__name__)
 
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 @@ class TestController(TestCase):
 
        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])
 

	
rhodecode/tests/functional/test_admin_repos_groups.py
Show inline comments
 
new file 100644
 
from rhodecode.tests import *
 

	
 
class TestReposGroupsController(TestController):
 
    pass
rhodecode/tests/functional/test_admin_settings.py
Show inline comments
 
@@ -61,8 +61,8 @@ class TestAdminSettingsController(TestCo
 
                                                 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 @@ class TestAdminSettingsController(TestCo
 
                                                     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 @@ class TestAdminSettingsController(TestCo
 
                                                            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)
 

	
rhodecode/tests/functional/test_admin_users_groups.py
Show inline comments
 
file renamed from rhodecode/tests/functional/test_users_groups.py to rhodecode/tests/functional/test_admin_users_groups.py
 
from rhodecode.tests import *
 

	
 
class TestUsersGroupsController(TestController):
 
TEST_USERS_GROUP = 'admins_test'
 

	
 
class TestAdminUsersGroupsController(TestController):
 

	
 
    def test_index(self):
 
        response = self.app.get(url('users_groups'))
 
@@ -10,7 +12,18 @@ class TestUsersGroupsController(TestCont
 
        response = self.app.get(url('formatted_users_groups', format='xml'))
 

	
 
    def test_create(self):
 
        response = self.app.post(url('users_groups'))
 
        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'))
 
@@ -41,3 +54,16 @@ class TestUsersGroupsController(TestCont
 

	
 
    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
 

	
 

	
 

	
 

	
0 comments (0 inline, 0 general)