--- a/web/test/unittest_form.py Mon Dec 21 20:28:01 2009 +0100
+++ b/web/test/unittest_form.py Mon Dec 21 20:28:08 2009 +0100
@@ -15,7 +15,7 @@
from cubicweb import Binary
from cubicweb.devtools.testlib import CubicWebTC
from cubicweb.web.formfields import (IntField, StringField, RichTextField,
- DateTimeField, DateTimePicker,
+ PasswordField, DateTimeField, DateTimePicker,
FileField, EditableFileField)
from cubicweb.web.formwidgets import PasswordInput, Input
from cubicweb.web.views.forms import EntityFieldsForm, FieldsForm
@@ -27,10 +27,10 @@
def test_form_field_format(self):
form = FieldsForm(self.request(), None)
- self.assertEquals(form.form_field_format(None), 'text/html')
+ self.assertEquals(StringField().format(form), 'text/html')
self.execute('INSERT CWProperty X: X pkey "ui.default-text-format", X value "text/rest", X for_user U WHERE U login "admin"')
self.commit()
- self.assertEquals(form.form_field_format(None), 'text/rest')
+ self.assertEquals(StringField().format(form), 'text/rest')
class EntityFieldsFormTC(CubicWebTC):
@@ -41,42 +41,28 @@
self.entity = self.user(self.req)
def test_form_field_vocabulary_unrelated(self):
- b = self.add_entity('BlogEntry', title=u'di mascii code', content=u'a best-seller')
- t = self.add_entity('Tag', name=u'x')
- form1 = EntityFieldsForm(self.request(), None, entity=t)
- unrelated = [reid for rview, reid in form1.subject_relation_vocabulary('tags')]
+ b = self.req.create_entity('BlogEntry', title=u'di mascii code', content=u'a best-seller')
+ t = self.req.create_entity('Tag', name=u'x')
+ form1 = self.vreg['forms'].select('edition', self.req, entity=t)
+ unrelated = [reid for rview, reid in form1.field_by_name('tags', 'subject', t.e_schema).choices(form1)]
self.failUnless(b.eid in unrelated, unrelated)
- form2 = EntityFieldsForm(self.request(), None, entity=b)
- unrelated = [reid for rview, reid in form2.object_relation_vocabulary('tags')]
+ form2 = self.vreg['forms'].select('edition', self.req, entity=b)
+ unrelated = [reid for rview, reid in form2.field_by_name('tags', 'object', t.e_schema).choices(form2)]
self.failUnless(t.eid in unrelated, unrelated)
self.execute('SET X tags Y WHERE X is Tag, Y is BlogEntry')
- unrelated = [reid for rview, reid in form1.subject_relation_vocabulary('tags')]
+ unrelated = [reid for rview, reid in form1.field_by_name('tags', 'subject', t.e_schema).choices(form1)]
self.failIf(b.eid in unrelated, unrelated)
- unrelated = [reid for rview, reid in form2.object_relation_vocabulary('tags')]
+ unrelated = [reid for rview, reid in form2.field_by_name('tags', 'object', t.e_schema).choices(form2)]
self.failIf(t.eid in unrelated, unrelated)
def test_form_field_vocabulary_new_entity(self):
e = self.vreg['etypes'].etype_class('CWUser')(self.request())
- form = EntityFieldsForm(e.req, None, entity=e)
- unrelated = [rview for rview, reid in form.subject_relation_vocabulary('in_group')]
+ form = self.vreg['forms'].select('edition', self.req, entity=e)
+ unrelated = [rview for rview, reid in form.field_by_name('in_group', 'subject').choices(form)]
# should be default groups but owners, i.e. managers, users, guests
self.assertEquals(unrelated, [u'guests', u'managers', u'users'])
- # def test_subject_in_state_vocabulary(self):
- # # on a new entity
- # e = self.etype_instance('CWUser')
- # form = EntityFieldsForm(self.request(), None, entity=e)
- # states = list(form.subject_in_state_vocabulary('in_state'))
- # self.assertEquals(len(states), 1)
- # self.assertEquals(states[0][0], u'activated') # list of (combobox view, state eid)
- # # on an existant entity
- # e = self.user()
- # form = EntityFieldsForm(self.request(), None, entity=e)
- # states = list(form.subject_in_state_vocabulary('in_state'))
- # self.assertEquals(len(states), 1)
- # self.assertEquals(states[0][0], u'deactivated') # list of (combobox view, state eid)
-
def test_consider_req_form_params(self):
e = self.vreg['etypes'].etype_class('CWUser')(self.request())
e.eid = 'A'
@@ -84,20 +70,20 @@
field = StringField(name='login', eidparam=True)
form.append_field(field)
form.build_context({})
- self.assertEquals(form.form_field_display_value(field, {}), 'toto')
+ self.assertEquals(field.display_value(form), 'toto')
def test_linkto_field_duplication(self):
e = self.vreg['etypes'].etype_class('CWUser')(self.request())
e.eid = 'A'
- e.req = self.req
+ e._cw = self.req
geid = self.execute('CWGroup X WHERE X name "users"')[0][0]
self.req.form['__linkto'] = 'in_group:%s:subject' % geid
form = self.vreg['forms'].select('edition', self.req, entity=e)
form.content_type = 'text/html'
pageinfo = self._check_html(form.render(), form, template=None)
inputs = pageinfo.find_tag('select', False)
- self.failUnless(any(attrs for t, attrs in inputs if attrs.get('name') == 'in_group:A'))
+ self.failUnless(any(attrs for t, attrs in inputs if attrs.get('name') == 'in_group-subject:A'))
inputs = pageinfo.find_tag('input', False)
self.failIf(any(attrs for t, attrs in inputs if attrs.get('name') == '__linkto'))
@@ -106,8 +92,7 @@
form = self.vreg['views'].select('doreledit', self.request(),
rset=rset, row=0, rtype='content')
data = form.render(row=0, rtype='content')
- self.failUnless('edits-content' in data)
- self.failUnless('edits-content_format' in data)
+ self.failUnless('content_format' in data)
# form view tests #########################################################
@@ -140,98 +125,102 @@
def _render_entity_field(self, name, form):
form.build_context({})
renderer = FormRenderer(self.req)
- return form.field_by_name(name).render(form, renderer)
+ return form.field_by_name(name, 'subject').render(form, renderer)
def _test_richtextfield(self, expected):
class RTFForm(EntityFieldsForm):
- description = RichTextField()
+ description = RichTextField(eidparam=True, role='subject')
state = self.execute('State X WHERE X name "activated", X state_of WF, WF workflow_of ET, ET name "CWUser"').get_entity(0, 0)
form = RTFForm(self.req, redirect_path='perdu.com', entity=state)
# make it think it can use fck editor anyway
- form.form_field_format = lambda x: 'text/html'
+ form.field_by_name('description', 'subject').format = lambda x: 'text/html'
self.assertTextEquals(self._render_entity_field('description', form),
expected % {'eid': state.eid})
def test_richtextfield_1(self):
self.req.use_fckeditor = lambda: False
- self._test_richtextfield('''<select id="description_format:%(eid)s" name="description_format:%(eid)s" size="1" style="display: block" tabindex="1">
+ self._test_richtextfield('''<select id="description_format-subject:%(eid)s" name="description_format-subject:%(eid)s" size="1" style="display: block" tabindex="1">
<option value="text/cubicweb-page-template">text/cubicweb-page-template</option>
-<option value="text/html">text/html</option>
+<option selected="selected" value="text/html">text/html</option>
<option value="text/plain">text/plain</option>
-<option selected="selected" value="text/rest">text/rest</option>
-</select><textarea cols="80" id="description:%(eid)s" name="description:%(eid)s" onkeyup="autogrow(this)" rows="2" tabindex="2"></textarea>''')
+<option value="text/rest">text/rest</option>
+</select><textarea cols="80" id="description-subject:%(eid)s" name="description-subject:%(eid)s" onkeyup="autogrow(this)" rows="2" tabindex="2"></textarea>''')
def test_richtextfield_2(self):
self.req.use_fckeditor = lambda: True
- self._test_richtextfield('<input name="description_format:%(eid)s" type="hidden" value="text/rest" /><textarea cols="80" cubicweb:type="wysiwyg" id="description:%(eid)s" name="description:%(eid)s" onkeyup="autogrow(this)" rows="2" tabindex="1"></textarea>')
+ self._test_richtextfield('<input name="description_format-subject:%(eid)s" type="hidden" value="text/html" /><textarea cols="80" cubicweb:type="wysiwyg" id="description-subject:%(eid)s" name="description-subject:%(eid)s" onkeyup="autogrow(this)" rows="2" tabindex="1"></textarea>')
def test_filefield(self):
class FFForm(EntityFieldsForm):
- data = FileField(format_field=StringField(name='data_format', max_length=50),
- encoding_field=StringField(name='data_encoding', max_length=20))
- file = self.add_entity('File', data_name=u"pouet.txt", data_encoding=u'UTF-8',
+ data = FileField(
+ format_field=StringField(name='data_format', max_length=50,
+ eidparam=True, role='subject'),
+ encoding_field=StringField(name='data_encoding', max_length=20,
+ eidparam=True, role='subject'),
+ eidparam=True, role='subject')
+ file = self.req.create_entity('File', data_name=u"pouet.txt", data_encoding=u'UTF-8',
data=Binary('new widgets system'))
form = FFForm(self.req, redirect_path='perdu.com', entity=file)
self.assertTextEquals(self._render_entity_field('data', form),
- '''<input id="data:%(eid)s" name="data:%(eid)s" tabindex="1" type="file" value="" />
-<a href="javascript: toggleVisibility('data:%(eid)s-advanced')" title="show advanced fields"><img src="http://testing.fr/cubicweb/data/puce_down.png" alt="show advanced fields"/></a>
-<div id="data:%(eid)s-advanced" class="hidden">
-<label for="data_format:%(eid)s">data_format</label><input id="data_format:%(eid)s" maxlength="50" name="data_format:%(eid)s" size="45" tabindex="2" type="text" value="text/plain" /><br/>
-<label for="data_encoding:%(eid)s">data_encoding</label><input id="data_encoding:%(eid)s" maxlength="20" name="data_encoding:%(eid)s" size="20" tabindex="3" type="text" value="UTF-8" /><br/>
+ '''<input id="data-subject:%(eid)s" name="data-subject:%(eid)s" tabindex="1" type="file" value="" />
+<a href="javascript: toggleVisibility('data-subject:%(eid)s-advanced')" title="show advanced fields"><img src="http://testing.fr/cubicweb/data/puce_down.png" alt="show advanced fields"/></a>
+<div id="data-subject:%(eid)s-advanced" class="hidden">
+<label for="data_format-subject:%(eid)s">data_format</label><input id="data_format-subject:%(eid)s" maxlength="50" name="data_format-subject:%(eid)s" size="45" tabindex="2" type="text" value="text/plain" /><br/>
+<label for="data_encoding-subject:%(eid)s">data_encoding</label><input id="data_encoding-subject:%(eid)s" maxlength="20" name="data_encoding-subject:%(eid)s" size="20" tabindex="3" type="text" value="UTF-8" /><br/>
</div>
<br/>
-<input name="data:%(eid)s__detach" type="checkbox" />
+<input name="data-subject__detach:%(eid)s" type="checkbox" />
detach attached file
''' % {'eid': file.eid})
def test_editablefilefield(self):
class EFFForm(EntityFieldsForm):
- data = EditableFileField(format_field=StringField(name='data_format', max_length=50),
- encoding_field=StringField(name='data_encoding', max_length=20))
- def form_field_encoding(self, field):
- return 'ascii'
- def form_field_format(self, field):
- return 'text/plain'
- file = self.add_entity('File', data_name=u"pouet.txt", data_encoding=u'UTF-8',
+ data = EditableFileField(
+ format_field=StringField('data_format', max_length=50,
+ eidparam=True, role='subject'),
+ encoding_field=StringField('data_encoding', max_length=20,
+ eidparam=True, role='subject'),
+ eidparam=True, role='subject')
+ file = self.req.create_entity('File', data_name=u"pouet.txt", data_encoding=u'UTF-8',
data=Binary('new widgets system'))
form = EFFForm(self.req, redirect_path='perdu.com', entity=file)
self.assertTextEquals(self._render_entity_field('data', form),
- '''<input id="data:%(eid)s" name="data:%(eid)s" tabindex="1" type="file" value="" />
-<a href="javascript: toggleVisibility('data:%(eid)s-advanced')" title="show advanced fields"><img src="http://testing.fr/cubicweb/data/puce_down.png" alt="show advanced fields"/></a>
-<div id="data:%(eid)s-advanced" class="hidden">
-<label for="data_format:%(eid)s">data_format</label><input id="data_format:%(eid)s" maxlength="50" name="data_format:%(eid)s" size="45" tabindex="2" type="text" value="text/plain" /><br/>
-<label for="data_encoding:%(eid)s">data_encoding</label><input id="data_encoding:%(eid)s" maxlength="20" name="data_encoding:%(eid)s" size="20" tabindex="3" type="text" value="UTF-8" /><br/>
+ '''<input id="data-subject:%(eid)s" name="data-subject:%(eid)s" tabindex="1" type="file" value="" />
+<a href="javascript: toggleVisibility('data-subject:%(eid)s-advanced')" title="show advanced fields"><img src="http://testing.fr/cubicweb/data/puce_down.png" alt="show advanced fields"/></a>
+<div id="data-subject:%(eid)s-advanced" class="hidden">
+<label for="data_format-subject:%(eid)s">data_format</label><input id="data_format-subject:%(eid)s" maxlength="50" name="data_format-subject:%(eid)s" size="45" tabindex="2" type="text" value="text/plain" /><br/>
+<label for="data_encoding-subject:%(eid)s">data_encoding</label><input id="data_encoding-subject:%(eid)s" maxlength="20" name="data_encoding-subject:%(eid)s" size="20" tabindex="3" type="text" value="UTF-8" /><br/>
</div>
<br/>
-<input name="data:%(eid)s__detach" type="checkbox" />
+<input name="data-subject__detach:%(eid)s" type="checkbox" />
detach attached file
<p><b>You can either submit a new file using the browse button above, or choose to remove already uploaded file by checking the "detach attached file" check-box, or edit file content online with the widget below.</b></p>
-<textarea cols="80" name="data:%(eid)s" onkeyup="autogrow(this)" rows="3" tabindex="4">new widgets system</textarea>''' % {'eid': file.eid})
+<textarea cols="80" name="data-subject:%(eid)s" onkeyup="autogrow(this)" rows="3" tabindex="4">new widgets system</textarea>''' % {'eid': file.eid})
def test_passwordfield(self):
class PFForm(EntityFieldsForm):
- upassword = StringField(widget=PasswordInput)
+ upassword = PasswordField(eidparam=True, role='subject')
form = PFForm(self.req, redirect_path='perdu.com', entity=self.entity)
self.assertTextEquals(self._render_entity_field('upassword', form),
- '''<input id="upassword:%(eid)s" name="upassword:%(eid)s" tabindex="1" type="password" value="__cubicweb_internal_field__" />
+ '''<input id="upassword-subject:%(eid)s" name="upassword-subject:%(eid)s" tabindex="1" type="password" value="__cubicweb_internal_field__" />
<br/>
-<input name="upassword-confirm:%(eid)s" tabindex="1" type="password" value="__cubicweb_internal_field__" />
+<input name="upassword-subject-confirm:%(eid)s" tabindex="1" type="password" value="__cubicweb_internal_field__" />
 
<span class="emphasis">confirm password</span>''' % {'eid': self.entity.eid})
- def test_datefield(self):
- class DFForm(EntityFieldsForm):
- creation_date = DateTimeField(widget=Input)
- form = DFForm(self.req, entity=self.entity)
- init, cur = (fromstring(self._render_entity_field(attr, form)).get('value')
- for attr in ('edits-creation_date', 'creation_date'))
- self.assertEquals(init, cur)
+ # def test_datefield(self):
+ # class DFForm(EntityFieldsForm):
+ # creation_date = DateTimeField(widget=Input)
+ # form = DFForm(self.req, entity=self.entity)
+ # init, cur = (fromstring(self._render_entity_field(attr, form)).get('value')
+ # for attr in ('edits-creation_date', 'creation_date'))
+ # self.assertEquals(init, cur)
if __name__ == '__main__':
unittest_main()