[#7903] ticket:818 Mention small letters in username validation error
diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index f523208..cfbad2c 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -56,7 +56,7 @@
def _validate_shortname(self, shortname, neighborhood, state):
if not h.re_project_name.match(shortname):
raise forge_exc.ProjectShortnameInvalid(
- 'Please use only letters, numbers, and dashes 3-15 characters long.',
+ 'Please use only small letters, numbers, and dashes 3-15 characters long.',
shortname, state)
def _validate_allowed(self, shortname, neighborhood, state):
@@ -747,7 +747,7 @@
validator=fev.Regex(
h.re_project_name))
username.validator._messages['invalid'] = (
- 'Usernames must include only letters, numbers, and dashes.'
+ 'Usernames must include only small letters, numbers, and dashes.'
' They must also start with a letter and be at least 3 characters'
' long.')
fields = [
diff --git a/Allura/allura/tests/functional/test_auth.py b/Allura/allura/tests/functional/test_auth.py
index 4522dd8..388be1a 100644
--- a/Allura/allura/tests/functional/test_auth.py
+++ b/Allura/allura/tests/functional/test_auth.py
@@ -670,9 +670,12 @@
r = self.app.get('/auth/create_account')
assert 'Create an Account' in r
r = self.app.post('/auth/save_new',
- params=dict(username='aaa', pw='123',
+ params=dict(username='AAA', pw='123',
_session_id=self.app.cookies['_session_id']))
- assert 'Enter a value 6 characters long or more' in r
+ assert_in('Enter a value 6 characters long or more', r)
+ assert_in('Usernames must include only small letters, numbers, '
+ 'and dashes. They must also start with a letter and be '
+ 'at least 3 characters long.', r)
r = self.app.post(
'/auth/save_new',
params=dict(
diff --git a/Allura/allura/tests/functional/test_neighborhood.py b/Allura/allura/tests/functional/test_neighborhood.py
index 593671d..3f4663f 100644
--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -509,7 +509,7 @@
antispam=True,
extra_environ=dict(username='root'))
assert r.html.find('div', {'class': 'error'}
- ).string == 'Please use only letters, numbers, and dashes 3-15 characters long.'
+ ).string == 'Please use only small letters, numbers, and dashes 3-15 characters long.'
r = self.app.post('/adobe/register',
params=dict(
project_unixname='mymoz', project_name='My Moz',
@@ -524,7 +524,7 @@
antispam=True,
extra_environ=dict(username='root'))
assert r.html.find('div', {'class': 'error'}
- ).string == 'Please use only letters, numbers, and dashes 3-15 characters long.'
+ ).string == 'Please use only small letters, numbers, and dashes 3-15 characters long.'
r = self.app.post('/p/register',
params=dict(
project_unixname='test', project_name='Tester',
@@ -834,7 +834,7 @@
r = self.app.get(
'/p/check_names?neighborhood=Projects&project_unixname=%s' % name)
assert_equal(
- r.json, {'project_unixname': 'Please use only letters, numbers, and dashes 3-15 characters long.'})
+ r.json, {'project_unixname': 'Please use only small letters, numbers, and dashes 3-15 characters long.'})
r = self.app.get(
'/p/check_names?neighborhood=Projects&project_unixname=mymoz')
assert_equal(r.json, {})
