Renamed name to firstname in forms

- added multiple test for edit my account and edit user from admin
- fixed issues with update user accounts from admin

rhodecode/controllers/admin/settings.py

@@ -356,15 +356,14 b' class SettingsController(BaseController)'
         #    h.form(url('admin_settings_my_account_update'),
         #           method='put')
         # url('admin_settings_my_account_update', id=ID)
-        user_model = UserModel()
         uid = self.rhodecode_user.user_id
+        email = self.rhodecode_user.email
         _form = UserForm(edit=True,
-                         old_data={'user_id': uid,
-                                   'email': self.rhodecode_user.email})()
+                         old_data={'user_id': uid, 'email': email})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
-            user_model.update_my_account(uid, form_result)
+            UserModel().update_my_account(uid, form_result)
             h.flash(_('Your account was updated successfully'),
                     category='success')
             Session.commit()

rhodecode/model/db.py

@@ -446,16 +446,14 b' class User(Base, BaseModel):'
         return data
 
     def __json__(self):
-        return dict(
-            user_id=self.user_id,
-            first_name=self.name,
-            last_name=self.lastname,
-            email=self.email,
+        data = dict(
             full_name=self.full_name,
             full_name_or_username=self.full_name_or_username,
             short_contact=self.short_contact,
             full_contact=self.full_contact
         )
+        data.update(self.get_api_data())
+        return data
 
 
 class UserEmailMap(Base, BaseModel):

rhodecode/model/forms.py

@@ -66,6 +66,7 b' def UserForm(edit=False, old_data={}):'
                        v.ValidUsername(edit, old_data))
         if edit:
             new_password = All(
+                v.ValidPassword(),
                 v.UnicodeString(strip=False, min=6, not_empty=False)
             )
             password_confirmation = All(
@@ -84,7 +85,7 b' def UserForm(edit=False, old_data={}):'
             )
 
         active = v.StringBoolean(if_missing=False)
-        name = v.UnicodeString(strip=True, min=1, not_empty=False)
+        firstname = v.UnicodeString(strip=True, min=1, not_empty=False)
         lastname = v.UnicodeString(strip=True, min=1, not_empty=False)
         email = All(v.Email(not_empty=True), v.UniqSystemEmail(old_data))
 

rhodecode/model/user.py

@@ -96,6 +96,8 b' class UserModel(BaseModel):'
             for k, v in form_data.items():
                 if k == 'password':
                     v = get_crypt_password(v)
+                if k == 'firstname':
+                    k = 'name'
                 setattr(new_user, k, v)
 
             new_user.api_key = generate_api_key(form_data['username'])
@@ -264,12 +266,13 b' class UserModel(BaseModel):'
                                   " crucial for entire application"))
 
             for k, v in form_data.items():
-                if k == 'new_password' and v != '':
+                if k == 'new_password' and v:
                     user.password = get_crypt_password(v)
                     user.api_key = generate_api_key(user.username)
                 else:
+                    if k == 'firstname':
+                        k = 'name'
                     setattr(user, k, v)
-
             self.sa.add(user)
         except:
             log.error(traceback.format_exc())
@@ -285,10 +288,12 b' class UserModel(BaseModel):'
                       " crucial for entire application")
                 )
             for k, v in form_data.items():
-                if k == 'new_password' and v != '':
+                if k == 'new_password' and v:
                     user.password = get_crypt_password(v)
                     user.api_key = generate_api_key(user.username)
                 else:
+                    if k == 'firstname':
+                        k = 'name'
                     if k not in ['admin', 'active']:
                         setattr(user, k, v)
 

rhodecode/templates/admin/users/user_edit.html

@@ -83,10 +83,10 b''
 
              <div class="field">
                 <div class="label">
-                    <label for="name">${_('First Name')}:</label>
+                    <label for="firstname">${_('First Name')}:</label>
                 </div>
                 <div class="input">
-                    ${h.text('name',class_='medium')}
+                    ${h.text('firstname',class_='medium')}
                 </div>
              </div>
 

rhodecode/templates/admin/users/user_edit_my_account_form.html

@@ -53,7 +53,7 b''
                         <label for="name">${_('First Name')}:</label>
                     </div>
                     <div class="input">
-                        ${h.text('name',class_="medium")}
+                        ${h.text('firstname',class_="medium")}
                     </div>
                  </div>
 

rhodecode/tests/functional/test_admin_settings.py

@@ -4,6 +4,7 b' from rhodecode.lib.auth import get_crypt'
 from rhodecode.model.db import User, RhodeCodeSetting
 from rhodecode.tests import *
 from rhodecode.lib import helpers as h
+from rhodecode.model.user import UserModel
 
 
 class TestAdminSettingsController(TestController):
@@ -68,8 +69,7 b' class TestAdminSettingsController(TestCo'
                          .get_app_settings()['rhodecode_ga_code'], new_ga_code)
 
         response = response.follow()
-        self.assertTrue("""_gaq.push(['_setAccount', '%s']);""" % new_ga_code
-                        in response.body)
+        response.mustcontain("""_gaq.push(['_setAccount', '%s']);""" % new_ga_code)
 
     def test_ga_code_inactive(self):
         self.log_user()
@@ -90,8 +90,8 b' class TestAdminSettingsController(TestCo'
                         .get_app_settings()['rhodecode_ga_code'], new_ga_code)
 
         response = response.follow()
-        self.assertTrue("""_gaq.push(['_setAccount', '%s']);""" % new_ga_code
-                        not in response.body)
+        self.assertFalse("""_gaq.push(['_setAccount', '%s']);""" % new_ga_code
+                         in response.body)
 
     def test_title_change(self):
         self.log_user()
@@ -114,8 +114,7 b' class TestAdminSettingsController(TestCo'
                              new_title.decode('utf-8'))
 
             response = response.follow()
-            self.assertTrue("""<h1><a href="/">%s</a></h1>""" % new_title
-                        in response.body)
+            response.mustcontain("""<h1><a href="/">%s</a></h1>""" % new_title)
 
     def test_my_account(self):
         self.log_user()
@@ -123,74 +122,73 b' class TestAdminSettingsController(TestCo'
 
         self.assertTrue('value="test_admin' in response.body)
 
-    def test_my_account_update(self):
-        self.log_user()
-
-        new_email = '[e-mail]'
-        new_name = 'NewName'
-        new_lastname = 'NewLastname'
-        new_password = 'test123'
-
-        response = self.app.post(url('admin_settings_my_account_update'),
-                                 params=dict(_method='put',
-                                             username='test_admin',
-                                             new_password=new_password,
-                                             password_confirmation=new_password,
-                                             password='',
-                                             name=new_name,
-                                             lastname=new_lastname,
-                                             email=new_email,))
-        response.follow()
+    @parameterized.expand([('firstname', 'new_username'),
+                           ('lastname', 'new_username'),
+                           ('admin', True),
+                           ('admin', False),
+                           ('ldap_dn', 'test'),
+                           ('ldap_dn', None),
+                           ('active', False),
+                           ('active', True),
+                           ('email', '[e-mail]'),
+                           ])
+    def test_my_account_update(self, name, expected):
+        uname = 'testme'
+        usr = UserModel().create_or_update(username=uname, password='qweqwe',
+                                           email='[e-mail]')
+        self.Session().commit()
+        params = usr.get_api_data()
+        user_id = usr.user_id
+        self.log_user(username=uname, password='qweqwe')
+        params.update({name: expected})
+        params.update({'password_confirmation': ''})
+        params.update({'new_password': ''})
 
-        assert 'Your account was updated successfully' in response.session['flash'][0][1], 'no flash message about success of change'
-        user = self.Session.query(User).filter(User.username == 'test_admin').one()
-        assert user.email == new_email, 'incorrect user email after update got %s vs %s' % (user.email, new_email)
-        assert user.name == new_name, 'updated field mismatch %s vs %s' % (user.name, new_name)
-        assert user.lastname == new_lastname, 'updated field mismatch %s vs %s' % (user.lastname, new_lastname)
-        assert check_password(new_password, user.password) is True, 'password field mismatch %s vs %s' % (user.password, new_password)
+        try:
+            response = self.app.put(url('admin_settings_my_account_update',
+                                        id=user_id), params)
 
-        #bring back the admin settings
-        old_email = '[e-mail]'
-        old_name = 'RhodeCode'
-        old_lastname = 'Admin'
-        old_password = 'test12'
-
-        response = self.app.post(url('admin_settings_my_account_update'), params=dict(
-                                                            _method='put',
-                                                            username='test_admin',
-                                                            new_password=old_password,
-                                                            password_confirmation=old_password,
-                                                            password='',
-                                                            name=old_name,
-                                                            lastname=old_lastname,
-                                                            email=old_email,))
-
-        response.follow()
         self.checkSessionFlash(response,
                                'Your account was updated successfully')
 
-        user = self.Session.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)
+            updated_user = User.get_by_username(uname)
+            updated_params = updated_user.get_api_data()
+            updated_params.update({'password_confirmation': ''})
+            updated_params.update({'new_password': ''})
 
-        assert user.email == old_email, 'incorrect user email after update got %s vs %s' % (user.email, old_email)
-        assert user.name == old_name, 'updated field mismatch %s vs %s' % (user.name, old_name)
-        assert user.lastname == old_lastname, 'updated field mismatch %s vs %s' % (user.lastname, old_lastname)
-        assert check_password(old_password, user.password) is True, 'password updated field mismatch %s vs %s' % (user.password, old_password)
+            params['last_login'] = updated_params['last_login']
+            if name == 'email':
+                params['emails'] = [expected]
+            if name == 'ldap_dn':
+                #cannot update this via form
+                params['ldap_dn'] = None
+            if name == 'active':
+                #my account cannot deactivate account
+                params['active'] = True
+            if name == 'admin':
+                #my account cannot make you an admin !
+                params['admin'] = False
+
+            self.assertEqual(params, updated_params)
+
+        finally:
+            UserModel().delete('testme')
 
     def test_my_account_update_err_email_exists(self):
         self.log_user()
 
         new_email = '[e-mail]'  # already exisitn email
-        response = self.app.post(url('admin_settings_my_account_update'), params=dict(
-                                                            _method='put',
+        response = self.app.put(url('admin_settings_my_account_update'),
+                                params=dict(
                                                             username='test_admin',
                                                             new_password='test12',
                                                             password_confirmation='test122',
-                                                            name='NewName',
+                                    firstname='NewName',
                                                             lastname='NewLastname',
-                                                            email=new_email,))
+                                    email=new_email,)
+                                )
 
-        assert 'This e-mail address is already taken' in response.body, 'Missing error message about existing email'
+        response.mustcontain('This e-mail address is already taken')
 
     def test_my_account_update_err(self):
         self.log_user('test_regular2', 'test12')
@@ -202,7 +200,7 b' class TestAdminSettingsController(TestCo'
                                             username='test_admin',
                                             new_password='test12',
                                             password_confirmation='test122',
-                                            name='NewName',
+                                            firstname='NewName',
                                             lastname='NewLastname',
                                             email=new_email,)
                                  )

rhodecode/tests/functional/test_admin_users.py

@@ -31,14 +31,13 b' class TestAdminUsersController(TestContr'
                              {'username': username,
                                'password': password,
                                'password_confirmation': password_confirmation,
-                               'name': name,
+                               'firstname': name,
                                'active': True,
                                'lastname': lastname,
                                'email': email})
 
         self.checkSessionFlash(response, '''created user %s''' % (username))
 
-
         new_user = self.Session.query(User).\
             filter(User.username == username).one()
 
@@ -50,7 +49,7 b' class TestAdminUsersController(TestContr'
 
         response.follow()
         response = response.follow()
-        self.assertTrue("""edit">newtestuser</a>""" in response.body)
+        response.mustcontain("""edit">newtestuser</a>""")
 
     def test_create_err(self):
         self.log_user()
@@ -85,8 +84,45 b' class TestAdminUsersController(TestContr'
     def test_new_as_xml(self):
         response = self.app.get(url('formatted_new_user', format='xml'))
 
-    def test_update(self):
-        response = self.app.put(url('user', id=1))
+    @parameterized.expand([('firstname', 'new_username'),
+                           ('lastname', 'new_username'),
+                           ('admin', True),
+                           ('admin', False),
+                           ('ldap_dn', 'test'),
+                           ('ldap_dn', None),
+                           ('active', False),
+                           ('active', True),
+                           ('email', '[e-mail]'),
+                           ])
+    def test_update(self, name, expected):
+        self.log_user()
+        uname = 'testme'
+        usr = UserModel().create_or_update(username=uname, password='qweqwe',
+                                           email='[e-mail]')
+        self.Session().commit()
+        params = usr.get_api_data()
+        params.update({name: expected})
+        params.update({'password_confirmation': ''})
+        params.update({'new_password': ''})
+        if name == 'email':
+            params['emails'] = [expected]
+        if name == 'ldap_dn':
+            #cannot update this via form
+            params['ldap_dn'] = None
+        try:
+            response = self.app.put(url('user', id=usr.user_id), params)
+
+            self.checkSessionFlash(response, '''User updated successfully''')
+
+            updated_user = User.get_by_username(uname)
+            updated_params = updated_user.get_api_data()
+            updated_params.update({'password_confirmation': ''})
+            updated_params.update({'new_password': ''})
+
+            self.assertEqual(params, updated_params)
+
+        finally:
+            UserModel().delete('testme')
 
     def test_update_browser_fakeout(self):
         response = self.app.post(url('user', id=1), params=dict(_method='put'))
@@ -102,7 +138,7 b' class TestAdminUsersController(TestContr'
         response = self.app.post(url('users'), {'username': username,
                                                'password': password,
                                                'password_confirmation': password,
-                                               'name': name,
+                                               'firstname': name,
                                                'active': True,
                                                'lastname': lastname,
                                                'email': email})