2 files changed, 66 insertions, 37 deletions
diff --git a/install/ui/test/details_tests.js b/install/ui/test/details_tests.js
index c6a55cda..80136649 100644
--- a/install/ui/test/details_tests.js
+++ b/install/ui/test/details_tests.js
@@ -156,30 +156,58 @@ test("Testing details lifecycle: create, load.", function(){
         return widget;
     }
 
-    var entity =   IPA.
-        entity_builder().
-        entity('user').
-        details_facet({sections:[
-            {
-                name: 'identity',
-                label: IPA.messages.details.identity,
-                fields:['title','givenname','sn','cn','displayname', 'initials']
-            },
-            {
-                name: 'contact',
-                label:'contact',
-                fields:
-                [  {factory: test_widget,name:'test'},
-                   {factory: IPA.multivalued_text_widget, name:'mail'},
-                   {factory: IPA.multivalued_text_widget,
-                    name:'telephonenumber'},
-                   {factory: IPA.multivalued_text_widget, name:'pager'},
-                   {factory: IPA.multivalued_text_widget, name:'mobile'},
-                   {factory: IPA.multivalued_text_widget,
-                    name:'facsimiletelephonenumber'}]
-            }
-        ]}).build();
+    IPA.register('user', function(spec) {
+
+        var that = IPA.entity(spec);
+
+        that.init = function(params) {
+            that.entity_init(params);
+
+            params.builder.details_facet({
+                sections: [
+                    {
+                        name: 'identity',
+                        label: IPA.messages.details.identity,
+                        fields: [ 'title', 'givenname', 'sn', 'cn', 'displayname', 'initials' ]
+                    },
+                    {
+                        name: 'contact',
+                        label: 'contact',
+                        fields: [
+                            {
+                                factory: test_widget,
+                                name:'test'
+                            },
+                            {
+                                factory: IPA.multivalued_text_widget,
+                                name:'mail'
+                            },
+                            {
+                                factory: IPA.multivalued_text_widget,
+                                name:'telephonenumber'
+                            },
+                            {
+                                factory: IPA.multivalued_text_widget,
+                                name:'pager'
+                            },
+                            {
+                                factory: IPA.multivalued_text_widget,
+                                name:'mobile'
+                            },
+                            {
+                                factory: IPA.multivalued_text_widget,
+                                name:'facsimiletelephonenumber'
+                            }
+                        ]
+                    }
+                ]
+            });
+        };
+
+        return that;
+    });
 
+    var entity = IPA.get_entity('user');
 
     var entity_container = $('<div/>', {
         name: 'user',
diff --git a/install/ui/test/entity_tests.js b/install/ui/test/entity_tests.js
index 84a5e28f..f6554938 100644
--- a/install/ui/test/entity_tests.js
+++ b/install/ui/test/entity_tests.js
@@ -31,14 +31,20 @@ module('entity',{
             url: 'data',
             on_success: function(data, text_status, xhr) {
 
-                IPA.entity_factories.user = function(){
-                    return IPA.
-                        entity_builder().
-                        entity('user').
-                        search_facet({
-                            columns:['uid']}).
-                        build();
-                };
+                IPA.register('user', function(spec) {
+
+                    var that = IPA.entity(spec);
+
+                    that.init = function(params) {
+                        that.entity_init(params);
+
+                            params.builder.search_facet({
+                                columns: [ 'uid' ]
+                            });
+                    };
+
+                    return that;
+                });
             },
             on_error: function(xhr, text_status, error_thrown) {
                 ok(false, "ipa_init() failed: "+error_thrown);
@@ -60,12 +66,7 @@ test('Testing IPA.entity_set_search_definition().', function() {
         return true;
     };
 
-    var entity =   IPA.
-        entity_builder().
-        entity('user').
-        search_facet({
-            columns:['uid']}).
-        build();
+    var entity = IPA.get_entity('user');
 
     var entity_container = $('<div/>', {
         name: 'user',