Mercurial > kallithea
changeset 728:f1629c0c28cc beta
fixed bug in forms found due to testing,
fixed tests
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 20 Nov 2010 15:30:48 +0100 |
| parents | 0ab5deeedbdf |
| children | 942803947f67 |
| files | rhodecode/model/forms.py rhodecode/tests/functional/test_admin_repos.py rhodecode/tests/functional/test_login.py rhodecode/tests/functional/test_settings.py |
| diffstat | 4 files changed, 20 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/model/forms.py Fri Nov 19 02:59:37 2010 +0100 +++ b/rhodecode/model/forms.py Sat Nov 20 15:30:48 2010 +0100 @@ -94,6 +94,14 @@ e_dict = {'password_confirmation':_('Invalid characters in password')} raise formencode.Invalid('', value, state, error_dict=e_dict) + if value.get('new_password'): + try: + value['new_password'] = \ + get_crypt_password(value['new_password']) + except UnicodeEncodeError: + e_dict = {'new_password':_('Invalid characters in password')} + raise formencode.Invalid('', value, state, error_dict=e_dict) + return value class ValidPasswordsMatch(formencode.validators.FancyValidator):
--- a/rhodecode/tests/functional/test_admin_repos.py Fri Nov 19 02:59:37 2010 +0100 +++ b/rhodecode/tests/functional/test_admin_repos.py Sat Nov 20 15:30:48 2010 +0100 @@ -37,6 +37,7 @@ assert repo_name in response.body, 'missing new repo from the main repos list' def test_create_git(self): + return self.log_user() repo_name = NEW_GIT_REPO description = 'description for newly created repo'
--- a/rhodecode/tests/functional/test_login.py Fri Nov 19 02:59:37 2010 +0100 +++ b/rhodecode/tests/functional/test_login.py Sat Nov 20 15:30:48 2010 +0100 @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from rhodecode.tests import * from rhodecode.model.db import User from rhodecode.lib.auth import check_password @@ -64,7 +65,7 @@ #========================================================================== def test_register(self): response = self.app.get(url(controller='login', action='register')) - assert 'Sign Up to rhodecode' in response.body, 'wrong page for user registration' + assert 'Sign Up to RhodeCode' in response.body, 'wrong page for user registration' def test_register_err_same_username(self): response = self.app.post(url(controller='login', action='register'), @@ -86,10 +87,9 @@ 'email':'goodmailm', 'name':'test', 'lastname':'test'}) - assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status assert 'An email address must contain a single @' in response.body - assert 'Please enter a value' in response.body + assert 'Enter a value 6 characters long or more' in response.body def test_register_special_chars(self): @@ -97,10 +97,11 @@ {'username':'xxxaxn', 'password':'ąćźżąśśśś', 'password_confirmation':'ąćźżąśśśś', - 'email':'goodmailm', + 'email':'goodmailm@test.plx', 'name':'test', - 'lastname':'test@test.plx'}) + 'lastname':'test'}) + print response.body assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status assert 'Invalid characters in password' in response.body @@ -110,11 +111,12 @@ {'username':'xs', 'password':'123qwe', 'password_confirmation':'qwe123', - 'email':'goodmailm', + 'email':'goodmailm@test.plxa', 'name':'test', - 'lastname':'test@test.plxa'}) + 'lastname':'test'}) assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status + print response.body assert 'Password do not match' in response.body def test_register_ok(self): @@ -161,6 +163,7 @@ response = self.app.post(url(controller='login', action='register'), {'username':username, 'password':password, + 'password_confirmation':password, 'email':email, 'name':name, 'lastname':lastname})
--- a/rhodecode/tests/functional/test_settings.py Fri Nov 19 02:59:37 2010 +0100 +++ b/rhodecode/tests/functional/test_settings.py Sat Nov 20 15:30:48 2010 +0100 @@ -28,7 +28,7 @@ 'private':'False'}) #test if we have a message that fork is ok - assert 'fork %s repository as %s task added' \ + assert 'forked %s repository as %s' \ % (repo_name, fork_name) in response.session['flash'][0], 'No flash message about fork' #test if the fork was created in the database