6 files changed, 67 insertions, 64 deletions

diff --git a/install/static/test/aci_tests.js b/install/static/test/aci_tests.js
index 9505f1e1..c51b556d 100644
--- a/install/static/test/aci_tests.js
+++ b/install/static/test/aci_tests.js
@@ -36,7 +36,7 @@ module('aci',{
                }
            );
            aci_container = $('<div id="aci"/>').appendTo(document.body);
-           target_section = ipa_target_section();
+           target_section = IPA.target_section();
            target_section.create(aci_container);
        },
        teardown: function() {
diff --git a/install/static/test/association_tests.js b/install/static/test/association_tests.js
index 4ce1354d..a65678a7 100644
--- a/install/static/test/association_tests.js
+++ b/install/static/test/association_tests.js
@@ -18,11 +18,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+module('associate');
+
+
 test("Testing serial_associator().", function() {
 
     expect(10);
 
-    var orig_ipa_cmd = ipa_cmd;
+    var orig_ipa_cmd = IPA.cmd;
 
     var counter = 0;
 
@@ -35,22 +38,22 @@ test("Testing serial_associator().", function() {
 
     params.values = ['user1', 'user2', 'user3'];
 
-    ipa_cmd = function(name, args, options, win_callback, fail_callback, objname) {
+    IPA.cmd = function(name, args, options, win_callback, fail_callback, objname) {
         counter++;
 
         equals(
             name, params.method,
-            "Checking ipa_cmd() parameter: method"
+            "Checking IPA.cmd() parameter: method"
         );
 
         equals(
             objname, params.other_entity,
-            "Checking ipa_cmd() parameter: object name"
+            "Checking IPA.cmd() parameter: object name"
         );
 
         equals(
             args[0], "user"+counter,
-            "Checking ipa_cmd() parameter: primary key"
+            "Checking IPA.cmd() parameter: primary key"
         );
 
         var response = {};
@@ -65,14 +68,14 @@ test("Testing serial_associator().", function() {
     var associator = serial_associator(params);
     associator.execute();
 
-    ipa_cmd = orig_ipa_cmd;
+    IPA.cmd = orig_ipa_cmd;
 });
 
 test("Testing bulk_associator().", function() {
 
     expect(5);
 
-    var orig_ipa_cmd = ipa_cmd;
+    var orig_ipa_cmd = IPA.cmd;
 
     var counter = 0;
 
@@ -85,27 +88,27 @@ test("Testing bulk_associator().", function() {
 
     params.values = ['user1', 'user2', 'user3'];
 
-    ipa_cmd = function(name, args, options, win_callback, fail_callback, objname) {
+    IPA.cmd = function(name, args, options, win_callback, fail_callback, objname) {
         counter++;
 
         equals(
             name, params.method,
-            "Checking ipa_cmd() parameter: method"
+            "Checking IPA.cmd() parameter: method"
         );
 
         equals(
             objname, params.entity_name,
-            "Checking ipa_cmd() parameter: object name"
+            "Checking IPA.cmd() parameter: object name"
         );
 
         equals(
             args[0], params.pkey,
-            "Checking ipa_cmd() parameter: primary key"
+            "Checking IPA.cmd() parameter: primary key"
         );
 
         equals(
             options[params.other_entity], "user1,user2,user3",
-            "Checking ipa_cmd() parameter: options[\""+params.other_entity+"\"]"
+            "Checking IPA.cmd() parameter: options[\""+params.other_entity+"\"]"
         );
 
         var response = {};
@@ -120,5 +123,5 @@ test("Testing bulk_associator().", function() {
     var associator = bulk_associator(params);
     associator.execute();
 
-    ipa_cmd = orig_ipa_cmd;
+    IPA.cmd = orig_ipa_cmd;
 });
diff --git a/install/static/test/details_tests.js b/install/static/test/details_tests.js
index 1cb2036f..d832bd26 100644
--- a/install/static/test/details_tests.js
+++ b/install/static/test/details_tests.js
@@ -21,7 +21,7 @@
 
 module('details');
 
-test("Testing ipa_details_section.create().", function() {
+test("Testing IPA.details_section.create().", function() {
 
     IPA.ajax_options.async = false;
 
@@ -36,7 +36,7 @@ test("Testing ipa_details_section.create().", function() {
         }
     );
 
-    var section = ipa_stanza({name:'IDIDID', label:'NAMENAMENAME'}).
+    var section = IPA.stanza({name:'IDIDID', label:'NAMENAMENAME'}).
         input({name:'cn'}).
         input({name:'description'}).
         input({name:'number'});
@@ -108,16 +108,16 @@ test("Testing details lifecycle: create, setup, load.", function(){
 
     var result = {};
 
-    ipa_cmd(
+    IPA.cmd(
         'user_show',
         ['kfrog'],
         {},
         function(data, text_status, xhr) {
             result = data.result.result;
-            ok(true, "ipa_cmd() succeeded.");
+            ok(true, "IPA.cmd() succeeded.");
         },
         function(xhr, text_status, error_thrown) {
-            ok(false, "ipa_cmd() failed: "+error_thrown);
+            ok(false, "IPA.cmd() failed: "+error_thrown);
         }
     );
 
@@ -147,37 +147,37 @@ test("Testing details lifecycle: create, setup, load.", function(){
 
     var container = $("<div/>");
     var obj_name = 'user';
-    ipa_entity_set_details_definition(obj_name, [
-        ipa_stanza({name:'identity', label:'Identity Details'}).
+    IPA.entity_set_details_definition(obj_name, [
+        IPA.stanza({name:'identity', label:'Identity Details'}).
             input({name:'title'}).
             input({name:'givenname'}).
             input({name:'sn'}).
             input({name:'cn'}).
             input({name:'displayname'}).
             input({name:'initials'}),
-        ipa_stanza({name:'account', label:'Account Details'}).
+        IPA.stanza({name:'account', label:'Account Details'}).
             input({name:'status', setup: setup_status}).
             input({name:'uid'}).
             input({name:'userpassword', save: save_password}).
             input({name:'uidnumber'}).
             input({name:'gidnumber'}).
             input({name:'homedirectory'}),
-        ipa_stanza({name:'contact', label:'Contact Details'}).
+        IPA.stanza({name:'contact', label:'Contact Details'}).
             input({name:'mail'}).
             input({name:'telephonenumber'}),
-        ipa_stanza({name:'address'}).
+        IPA.stanza({name:'address'}).
             input({name:'street'}).
             input({name:'location'}).
             input({name:'state', setup: setup_st}).
             input({name:'postalcode'}),
-        ipa_stanza({name:'employee', label:'Employee Information'}).
+        IPA.stanza({name:'employee', label:'Employee Information'}).
             input({name:'ou'}).
             input({name:'manager', load: load_manager}),
-        ipa_stanza({name:'misc', label:'Misc. Information'}).
+        IPA.stanza({name:'misc', label:'Misc. Information'}).
             input({name:'carlicense'})
     ]);
 
-    var entity = ipa_get_entity(obj_name);
+    var entity = IPA.fetch_entity(obj_name);
     var facet = entity.get_facet('details');
     facet.create(container);
     facet.setup(container);
@@ -227,7 +227,7 @@ test("Testing details lifecycle: create, setup, load.", function(){
 
 test("Testing create_input().", function() {
 
-    var field = ipa_details_field({
+    var field = IPA.details_field({
         'name': "name"
     });
 
@@ -247,7 +247,7 @@ test("Testing create_input().", function() {
 
 test("Testing create_input() read only .", function() {
 
-    var field = ipa_details_field({
+    var field = IPA.details_field({
         'name': "name"
     });
 
@@ -270,9 +270,9 @@ test("Testing create_input() read only .", function() {
 
 
 
-test("Testing ipa_details_section_setup again()",function(){
+test("Testing IPA.details_section_setup again()",function(){
 
-    var section = ipa_stanza({name: 'IDIDID', label: 'NAMENAMENAME'}).
+    var section = IPA.stanza({name: 'IDIDID', label: 'NAMENAMENAME'}).
         input({name:'cn', label:'Entity Name'}).
         input({name:'description', label:'Description'}).
         input({name:'number', label:'Entity ID'});
diff --git a/install/static/test/entity_tests.js b/install/static/test/entity_tests.js
index 9d1356ea..a24f8081 100644
--- a/install/static/test/entity_tests.js
+++ b/install/static/test/entity_tests.js
@@ -20,20 +20,20 @@
 
 module('entity');
 
-test('Testing ipa_entity_set_search_definition().', function() {
+test('Testing IPA.entity_set_search_definition().', function() {
 
     var uid_callback = function() {
         return true;
     };
 
-    ipa_entity_set_search_definition('user', [
+    IPA.entity_set_search_definition('user', [
         ['uid', 'Login', uid_callback]
     ]);
 
-    var facet = ipa_entity_get_search_facet('user');
+    var facet = IPA.entity_get_search_facet('user');
     ok(
         facet,
-        'ipa_entity_get_search_facet(\'user\') is not null'
+        'IPA.entity_get_search_facet(\'user\') is not null'
     );
 
     var column = facet.get_columns()[0];
@@ -79,13 +79,13 @@ test('Testing ipa_facet_setup_views().', function() {
         }
     );
 
-    var entity = ipa_entity({
+    var entity = IPA.entity({
         'name': 'user'
     });
 
     IPA.add_entity(entity);
 
-    var facet = ipa_search_facet({
+    var facet = IPA.search_facet({
         'name': 'search',
         'label': 'Search'
     });
diff --git a/install/static/test/ipa_tests.js b/install/static/test/ipa_tests.js
index 23190c1f..4fa0d1ea 100644
--- a/install/static/test/ipa_tests.js
+++ b/install/static/test/ipa_tests.js
@@ -38,64 +38,64 @@ test("Testing ipa_init().", function() {
     );
 });
 
-test("Testing ipa_get_param_info().", function() {
+test("Testing IPA.get_param_info().", function() {
 
-    var param_info = ipa_get_param_info("user", "uid");
+    var param_info = IPA.get_param_info("user", "uid");
     ok(
         param_info,
-        "ipa_get_param_info(\"user\", \"uid\") not null"
+        "IPA.get_param_info(\"user\", \"uid\") not null"
     );
 
     equals(
         param_info["label"], "User login",
-        "ipa_get_param_info(\"user\", \"uid\")[\"label\"]"
+        "IPA.get_param_info(\"user\", \"uid\")[\"label\"]"
     );
 
     equals(
-        ipa_get_param_info("user", "wrong_attribute"), null,
-        "ipa_get_param_info(\"user\", \"wrong_attribute\")"
+        IPA.get_param_info("user", "wrong_attribute"), null,
+        "IPA.get_param_info(\"user\", \"wrong_attribute\")"
     );
 
     equals(
-        ipa_get_param_info("user", null), null,
-        "ipa_get_param_info(\"user\", null)"
+        IPA.get_param_info("user", null), null,
+        "IPA.get_param_info(\"user\", null)"
     );
 
     equals(
-        ipa_get_param_info("wrong_entity", "uid"), null,
-        "ipa_get_param_info(\"wrong_entity\", \"uid\")"
+        IPA.get_param_info("wrong_entity", "uid"), null,
+        "IPA.get_param_info(\"wrong_entity\", \"uid\")"
     );
 
     equals(
-        ipa_get_param_info(null, "uid"), null,
-        "ipa_get_param_info(null, \"uid\")"
+        IPA.get_param_info(null, "uid"), null,
+        "IPA.get_param_info(null, \"uid\")"
     );
 });
 
-test("Testing ipa_get_member_attribute().", function() {
+test("Testing IPA.get_member_attribute().", function() {
 
     equals(
-        ipa_get_member_attribute("user", "group"), "memberof",
-        "ipa_get_member_attribute(\"user\", \"group\")"
+        IPA.get_member_attribute("user", "group"), "memberof",
+        "IPA.get_member_attribute(\"user\", \"group\")"
     );
 
     equals(
-        ipa_get_member_attribute("user", "host"), null,
-        "ipa_get_member_attribute(\"user\", \"host\")"
+        IPA.get_member_attribute("user", "host"), null,
+        "IPA.get_member_attribute(\"user\", \"host\")"
     );
 
     equals(
-        ipa_get_member_attribute("user", null), null,
-        "ipa_get_member_attribute(\"user\", null)"
+        IPA.get_member_attribute("user", null), null,
+        "IPA.get_member_attribute(\"user\", null)"
     );
 
     equals(
-        ipa_get_member_attribute(null, "group"), null,
-        "ipa_get_member_attribute(null, \"group\")"
+        IPA.get_member_attribute(null, "group"), null,
+        "IPA.get_member_attribute(null, \"group\")"
     );
 });
 
-test("Testing successful ipa_cmd().", function() {
+test("Testing successful IPA.cmd().", function() {
 
     var method = 'method';
     var args = ['arg1', 'arg2', 'arg3'];
@@ -148,7 +148,7 @@ test("Testing successful ipa_cmd().", function() {
         request.success(xhr, text_status, error_thrown);
     };
 
-    ipa_cmd(method, args, options, success_handler, error_handler, object);
+    IPA.cmd(method, args, options, success_handler, error_handler, object);
 
     equals(
         ajax_counter, 1,
@@ -170,7 +170,7 @@ test("Testing successful ipa_cmd().", function() {
     $.ajax = orig;
 });
 
-test("Testing unsuccessful ipa_cmd().", function() {
+test("Testing unsuccessful IPA.cmd().", function() {
 
     var method = 'method';
     var args = ['arg1', 'arg2', 'arg3'];
@@ -223,7 +223,7 @@ test("Testing unsuccessful ipa_cmd().", function() {
         request.error(xhr, text_status, error_thrown);
     };
 
-    ipa_cmd(method, args, options, success_handler, error_handler, object);
+    IPA.cmd(method, args, options, success_handler, error_handler, object);
 
     var dialog = IPA.error_dialog.parent('.ui-dialog');
 
diff --git a/install/static/test/navigation_tests.js b/install/static/test/navigation_tests.js
index 4321939f..bc198ac0 100644
--- a/install/static/test/navigation_tests.js
+++ b/install/static/test/navigation_tests.js
@@ -30,7 +30,7 @@ test("Testing nav_create().", function() {
                 {name:'group', entity:'group'}
             ]}];
 
-    var entity = ipa_entity({name: 'user'});
+    var entity = IPA.entity({name: 'user'});
     entity.setup = function(container){
         user_mock_called = true;
         same(container[0].id,'user','user id');
@@ -38,7 +38,7 @@ test("Testing nav_create().", function() {
     };
     IPA.add_entity(entity);
 
-    entity = ipa_entity({name: 'group'});
+    entity = IPA.entity({name: 'group'});
     entity.setup = function(container){
         group_mock_called = true;
         same(container[0].id,'group','group id');