[#6833] restore not_empty validation; expand test
diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index 554750a..de90d39 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -333,6 +333,7 @@
ew.SingleSelectField(
name='socialnetwork',
label='Social network',
+ validator=fev.UnicodeString(not_empty=True),
options=[ew.Option(py_value=name, label=name)
for name in socialnetworks]),
ew.TextField(
diff --git a/Allura/allura/tests/functional/test_auth.py b/Allura/allura/tests/functional/test_auth.py
index c112e38..a945c1a 100644
--- a/Allura/allura/tests/functional/test_auth.py
+++ b/Allura/allura/tests/functional/test_auth.py
@@ -499,13 +499,20 @@
assert len(user.socialnetworks) == 1 and \
{'socialnetwork':socialnetwork2, 'accounturl':accounturl2} in user.socialnetworks
- #Add invalid social network account
+ #Add empty social network account
r = self.app.post('/auth/user_info/contacts/add_social_network',
params=dict(accounturl = accounturl, socialnetwork=''))
user = M.User.query.get(username='test-admin')
assert len(user.socialnetworks) == 1 and \
{'socialnetwork':socialnetwork2, 'accounturl':accounturl2} in user.socialnetworks
+ #Add invalid social network account
+ r = self.app.post('/auth/user_info/contacts/add_social_network',
+ params=dict(accounturl = accounturl, socialnetwork='invalid'))
+ user = M.User.query.get(username='test-admin')
+ assert len(user.socialnetworks) == 1 and \
+ {'socialnetwork':socialnetwork2, 'accounturl':accounturl2} in user.socialnetworks
+
#Add telephone number
telnumber = '+3902123456'
r = self.app.post('/auth/user_info/contacts/add_telnumber',
