diff options
Diffstat (limited to 'install/ui/test')
| -rw-r--r-- | install/ui/test/association_tests.html | 2 | ||||
| -rw-r--r-- | install/ui/test/association_tests.js | 22 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 21 |
3 files changed, 13 insertions, 32 deletions
diff --git a/install/ui/test/association_tests.html b/install/ui/test/association_tests.html index 40b3c208d..383c9b0b6 100644 --- a/install/ui/test/association_tests.html +++ b/install/ui/test/association_tests.html @@ -5,6 +5,8 @@ <link rel="stylesheet" href="qunit.css" type="text/css" media="screen"> <script type="text/javascript" src="qunit.js"></script> <script type="text/javascript" src="../jquery.js"></script> + <script type="text/javascript" src="../jquery.ba-bbq.js"></script> + <script type="text/javascript" src="../jquery-ui.js"></script> <script type="text/javascript" src="../ipa.js"></script> <script type="text/javascript" src="../details.js"></script> <script type="text/javascript" src="../search.js"></script> 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; diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 862a9972f..d25f61033 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -4713,7 +4713,6 @@ ], "attribute_members": { "member": [ - "permission", "role" ], "memberof": [ @@ -5434,22 +5433,12 @@ "primary_key": "krbprincipalname", "rdn_attribute": "", "relationships": { - "member": [ - "Member", - "", - "no_" - ], - "memberindirect": [ - "Indirect Member", - null, - "no_indirect_" - ], - "memberof": [ - "Member Of", - "in_", - "not_in_" + "managedby": [ + "Managed by", + "man_by_", + "not_man_by_" ] - }, + }, "takes_params": [ { "alwaysask": false, |