diff options
Diffstat (limited to 'install/ui/test/association_tests.js')
-rw-r--r-- | install/ui/test/association_tests.js | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/install/ui/test/association_tests.js b/install/ui/test/association_tests.js index a65678a7f..41b113d76 100644 --- a/install/ui/test/association_tests.js +++ b/install/ui/test/association_tests.js @@ -23,7 +23,7 @@ module('associate'); test("Testing serial_associator().", function() { - expect(10); + expect(7); var orig_ipa_cmd = IPA.cmd; @@ -42,16 +42,11 @@ test("Testing serial_associator().", function() { counter++; equals( - name, params.method, + name, params.other_entity+'_'+params.method, "Checking IPA.cmd() parameter: method" ); equals( - objname, params.other_entity, - "Checking IPA.cmd() parameter: object name" - ); - - equals( args[0], "user"+counter, "Checking IPA.cmd() parameter: primary key" ); @@ -65,7 +60,7 @@ test("Testing serial_associator().", function() { ok(true, "on_success() is invoked."); }; - var associator = serial_associator(params); + var associator = IPA.serial_associator(params); associator.execute(); IPA.cmd = orig_ipa_cmd; @@ -73,7 +68,7 @@ test("Testing serial_associator().", function() { test("Testing bulk_associator().", function() { - expect(5); + expect(4); var orig_ipa_cmd = IPA.cmd; @@ -92,16 +87,11 @@ test("Testing bulk_associator().", function() { counter++; equals( - name, params.method, + name, params.entity_name+'_'+params.method, "Checking IPA.cmd() parameter: method" ); equals( - objname, params.entity_name, - "Checking IPA.cmd() parameter: object name" - ); - - equals( args[0], params.pkey, "Checking IPA.cmd() parameter: primary key" ); @@ -120,7 +110,7 @@ test("Testing bulk_associator().", function() { ok(true, "on_success() is invoked."); }; - var associator = bulk_associator(params); + var associator = IPA.bulk_associator(params); associator.execute(); IPA.cmd = orig_ipa_cmd; |