kallithea Changeset - f1629c0c28cc

Changeset - f1629c0c28cc

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 15 years ago 2010-11-20 15:30:48
marcin@python-works.com

fixed bug in forms found due to testing,
fixed tests

4 files changed with 20 insertions and 8 deletions:

rhodecode/model/forms.py

rhodecode/tests/functional/test_admin_repos.py

rhodecode/tests/functional/test_login.py

rhodecode/tests/functional/test_settings.py

0 comments (0 inline, 0 general)

rhodecode/model/forms.py

➞

Show inline comments

@@ @@ -91,12 +91,20 @@ class ValidPassword(formencode.validator @@
                     value['password_confirmation'] = \
                         get_crypt_password(value['password_confirmation'])
                 except UnicodeEncodeError:
                     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):
     def validate_python(self, value, state):

rhodecode/tests/functional/test_admin_repos.py

➞

Show inline comments

@@ @@ -34,12 +34,13 @@ class TestAdminReposController(TestContr @@
         #test if repository is visible in the list ?
         response = response.follow()
         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'
         private = False
         response = self.app.post(url('repos'), {'repo_name':repo_name,
                                                 'repo_type':'git',

rhodecode/tests/functional/test_login.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 from rhodecode.tests import *
 from rhodecode.model.db import User
 from rhodecode.lib.auth import check_password
 class TestLoginController(TestController):
@@ @@ -61,13 +62,13 @@ class TestLoginController(TestController @@
     #==========================================================================
     # REGISTRATIONS
     #==========================================================================
     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'),
                                             {'username':'test_admin',
                                              'password':'test12',
                                              'password_confirmation':'test12',
@@ @@ -83,41 +84,42 @@ class TestLoginController(TestController @@
                                             {'username':'xs',
                                              'password':'test',
                                              'password_confirmation':'test',
                                              '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):
         response = self.app.post(url(controller='login', action='register'),
                                             {'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
     def test_register_password_mismatch(self):
         response = self.app.post(url(controller='login', action='register'),
                                             {'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):
         username = 'test_regular4'
         password = 'qweqwe'
         email = 'marcin@test.com'
@@ @@ -158,12 +160,13 @@ class TestLoginController(TestController @@
         name = 'passwd'
         lastname = 'reset'
         response = self.app.post(url(controller='login', action='register'),
                                             {'username':username,
                                              'password':password,
                                              'password_confirmation':password,
                                              'email':email,
                                              'name':name,
                                              'lastname':lastname})
         #register new user for email test
         response = self.app.post(url(controller='login', action='password_reset'),
                                             {'email':email, })

rhodecode/tests/functional/test_settings.py

➞

Show inline comments

@@ @@ -25,13 +25,13 @@ class TestSettingsController(TestControl @@
                                     {'fork_name':fork_name,
                                      'repo_type':'hg',
                                      'description':description,
                                      '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
         fork_repo = self.sa.query(Repository).filter(Repository.repo_name == fork_name).one()
         assert fork_repo.repo_name == fork_name, 'wrong name of repo name in new db fork repo'

0 comments (0 inline, 0 general)