diff -r 2cb2c96c82d9 -r c2a80130b06d web/test/unittest_views_editforms.py
--- a/web/test/unittest_views_editforms.py	Wed May 13 17:01:42 2009 +0200
+++ b/web/test/unittest_views_editforms.py	Wed May 13 17:21:35 2009 +0200
@@ -9,13 +9,13 @@
 class AutomaticEntityFormTC(EnvBasedTC):
 
     def test_custom_widget(self):
-        AEF.rwidgets.tag_subject_of(('CWUser', 'login', '*'),
-                                    AutoCompletionWidget)
+        AEF.rfields_kwargs.tag_subject_of(('CWUser', 'login', '*'),
+                                          {'widget':AutoCompletionWidget})
         form = self.vreg.select_object('forms', 'edition', self.request(), None,
                                        entity=self.user())
         field = form.field_by_name('login')
         self.assertIsInstance(field.widget, AutoCompletionWidget)
-        AEF.rwidgets.del_rtag('!CWUser', 'login', '*')
+        AEF.rfields_kwargs.del_rtag('CWUser', 'login', '*', 'subject')
 
 
     def test_euser_relations_by_category(self):
@@ -44,13 +44,13 @@
                                ('bookmarked_by', 'object'),
                                ])
         self.assertListEquals(rbc(e, 'generic'),
-                              [('connait', 'subject'),
+                              [('primary_email', 'subject'),
+                               ('connait', 'subject'),
                                ('checked_by', 'object'),
                                ])
         # owned_by is defined both as subject and object relations on CWUser
         self.assertListEquals(rbc(e, 'generated'),
-                              [('primary_email', 'subject'),
-                               ('use_email', 'subject'),
+                              [('use_email', 'subject'),
                                ('has_text', 'subject'),
                                ('identity', 'subject'),
                                ('is', 'subject'),