From 5fc064f13e44812042a617a322bcd6111d2b39b2 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Mon, 7 Nov 2011 14:21:45 -0600
Subject: Refactored entity object resolution.

The IPA.get_entity() has been modified to accept either entity name
or entity object. If it receives an entity object it will return
the object itself. Otherwise, it will resolve the name in the entity
registry.

The other_entity variables have been modified to store a reference
to the entity object instead of its name. The test cases have been
modified to use real entity objects instead of just the names.

Ticket #2042
---
 install/ui/test/widget_tests.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'install/ui/test/widget_tests.js')

diff --git a/install/ui/test/widget_tests.js b/install/ui/test/widget_tests.js
index d9992e22..7dce9924 100644
--- a/install/ui/test/widget_tests.js
+++ b/install/ui/test/widget_tests.js
@@ -55,7 +55,6 @@ function base_widget_test(value){
 
     widget = factory(spec);
 
-    var entity_name = 'user';
     var field_name = widget.name;
     ok (widget, "Created Widget");
 
@@ -151,16 +150,14 @@ test("IPA.table_widget" ,function(){
         name:'uid',
         label:'User ID',
         primary_key:'uid',
-        width:'20em',
-        entity_name:'user'
+        width:'20em'
     }));
     widget.add_column(IPA.column({
         entity: spec.entity,
         name:'title',
         lable:'Title',
         primary_key:'uid',
-        width:'20em',
-        entity_name:'user'
+        width:'20em'
     }));
 
     ok(!widget.container,'widget has no container before create');
@@ -269,13 +266,14 @@ test("IPA.select_widget" ,function(){
 });
 
 
-test("IPA.entity_select_widget" ,function(){
-    factory =  IPA.entity_select_widget;
+test("IPA.entity_select_widget" ,function() {
+    var user = IPA.entity({ name: 'user' });
+    factory = IPA.entity_select_widget;
     spec = {
         name: 'uid',
-        other_entity:'user',
-        field_name:'uid',
-        other_field: 'uid' };
+        other_entity: user,
+        other_field: 'uid'
+    };
 
     base_widget_test('test_value');
     var mock_record = { uid: ['kfrog']};
-- 
cgit