6 files changed, 26 insertions, 40 deletions
diff --git a/install/ui/test/aci_tests.js b/install/ui/test/aci_tests.js
index 2ff1acdd..b050b747 100644
--- a/install/ui/test/aci_tests.js
+++ b/install/ui/test/aci_tests.js
@@ -26,15 +26,12 @@ var entity = {name:'bogus'};
 module('aci',{
        setup: function() {
            IPA.ajax_options.async = false;
-           IPA.init(
-               "data",
-               true,
-               function(data, text_status, xhr) {
-               },
-               function(xhr, text_status, error_thrown) {
+           IPA.init({
+               url: 'data',
+               on_error: function(xhr, text_status, error_thrown) {
                    ok(false, "ipa_init() failed: "+error_thrown);
                }
-           );
+           });
 
            target_container = $('<div id="target"/>').appendTo(document.body);
            target_section = IPA.permission_target_section({
diff --git a/install/ui/test/details_tests.js b/install/ui/test/details_tests.js
index 122234e7..c6a55cda 100644
--- a/install/ui/test/details_tests.js
+++ b/install/ui/test/details_tests.js
@@ -25,15 +25,12 @@ module('details', {
     setup: function() {
         IPA.ajax_options.async = false;
 
-        IPA.init(
-            "data",
-            true,
-            function(data, text_status, xhr) {
-            },
-            function(xhr, text_status, error_thrown) {
+        IPA.init({
+            url: 'data',
+            on_error: function(xhr, text_status, error_thrown) {
                 ok(false, "ipa_init() failed: "+error_thrown);
             }
-        );
+        });
 
         IPA.nav = {};
 
diff --git a/install/ui/test/entity_tests.js b/install/ui/test/entity_tests.js
index 12a1fcae..84a5e28f 100644
--- a/install/ui/test/entity_tests.js
+++ b/install/ui/test/entity_tests.js
@@ -27,10 +27,9 @@ module('entity',{
 
         IPA.ajax_options.async = false;
 
-        IPA.init(
-            "data",
-            true,
-            function(data, text_status, xhr) {
+        IPA.init({
+            url: 'data',
+            on_success: function(data, text_status, xhr) {
 
                 IPA.entity_factories.user = function(){
                     return IPA.
@@ -41,10 +40,10 @@ module('entity',{
                         build();
                 };
             },
-            function(xhr, text_status, error_thrown) {
+            on_error: function(xhr, text_status, error_thrown) {
                 ok(false, "ipa_init() failed: "+error_thrown);
             }
-        );
+        });
 
         entities_container = $('<div id="entities"/>').appendTo(document.body);
 
diff --git a/install/ui/test/ipa_tests.js b/install/ui/test/ipa_tests.js
index 8b3efc70..372f7687 100644
--- a/install/ui/test/ipa_tests.js
+++ b/install/ui/test/ipa_tests.js
@@ -26,16 +26,15 @@ test("Testing ipa_init().", function() {
 
     IPA.ajax_options.async = false;
 
-    IPA.init(
-        "data",
-        true,
-        function(data, text_status, xhr) {
+    IPA.init({
+        url: 'data',
+        on_success: function(data, text_status, xhr) {
             ok(true, "ipa_init() succeeded.");
         },
-        function(xhr, text_status, error_thrown) {
+        on_error: function(xhr, text_status, error_thrown) {
             ok(false, "ipa_init() failed: "+error_thrown);
         }
-    );
+    });
 });
 
 test("Testing IPA.get_entity_param().", function() {
diff --git a/install/ui/test/navigation_tests.js b/install/ui/test/navigation_tests.js
index 6df1926c..92a23eeb 100644
--- a/install/ui/test/navigation_tests.js
+++ b/install/ui/test/navigation_tests.js
@@ -23,15 +23,12 @@ module('navigation', {
 
     setup: function() {
         IPA.ajax_options.async = false;
-        IPA.init(
-            'data',
-            true,
-            function(data, text_status, xhr) {
-            },
-            function(xhr, text_status, error_thrown) {
+        IPA.init({
+            url: 'data',
+            on_error: function(xhr, text_status, error_thrown) {
                 ok(false, 'ipa_init() failed: '+error_thrown);
             }
-        );
+        });
     }
 
 });
diff --git a/install/ui/test/widget_tests.js b/install/ui/test/widget_tests.js
index 50a5f7d6..4549d5a9 100644
--- a/install/ui/test/widget_tests.js
+++ b/install/ui/test/widget_tests.js
@@ -28,15 +28,12 @@ var spec;
 module('widget',{
        setup: function() {
            IPA.ajax_options.async = false;
-           IPA.init(
-               "data",
-               true,
-               function(data, text_status, xhr) {
-               },
-               function(xhr, text_status, error_thrown) {
+           IPA.init({
+               url: 'data',
+               on_error: function(xhr, text_status, error_thrown) {
                    ok(false, "ipa_init() failed: "+error_thrown);
                }
-           );
+           });
            widget_container = $('<div id="widget"/>').appendTo(document.body);
 
            widget = null;