summaryrefslogtreecommitdiffstats
path: root/install/ui/test
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2011-11-07 14:21:45 -0600
committerPetr Vobornik <pvoborni@redhat.com>2011-12-21 14:59:49 +0100
commit5fc064f13e44812042a617a322bcd6111d2b39b2 (patch)
treef89503069c5d4eabbb940aff34b9733607ce93d2 /install/ui/test
parent49e5555b11d0bee814bce807acacbfeb381379f1 (diff)
downloadfreeipa.git-5fc064f13e44812042a617a322bcd6111d2b39b2.tar.gz
freeipa.git-5fc064f13e44812042a617a322bcd6111d2b39b2.tar.xz
freeipa.git-5fc064f13e44812042a617a322bcd6111d2b39b2.zip
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
Diffstat (limited to 'install/ui/test')
-rwxr-xr-xinstall/ui/test/aci_tests.html1
-rw-r--r--install/ui/test/aci_tests.js4
-rw-r--r--install/ui/test/association_tests.html1
-rw-r--r--install/ui/test/association_tests.js22
-rw-r--r--install/ui/test/details_tests.html1
-rw-r--r--install/ui/test/ipa_tests.html1
-rwxr-xr-xinstall/ui/test/ordered_map_tests.html1
-rwxr-xr-xinstall/ui/test/widget_tests.html5
-rw-r--r--install/ui/test/widget_tests.js18
9 files changed, 27 insertions, 27 deletions
diff --git a/install/ui/test/aci_tests.html b/install/ui/test/aci_tests.html
index 4d055a40..b5707303 100755
--- a/install/ui/test/aci_tests.html
+++ b/install/ui/test/aci_tests.html
@@ -20,7 +20,6 @@
<script type="text/javascript" src="../association.js"></script>
<script type="text/javascript" src="../navigation.js"></script>
<script type="text/javascript" src="../aci.js"></script>
-
<script type="text/javascript" src="aci_tests.js"></script>
</head>
<body>
diff --git a/install/ui/test/aci_tests.js b/install/ui/test/aci_tests.js
index 8f8e8b57..e166aa3d 100644
--- a/install/ui/test/aci_tests.js
+++ b/install/ui/test/aci_tests.js
@@ -22,7 +22,8 @@
var target_container;
var target_widget;
var target_facet;
-var entity = IPA.entity({ name:'bogus', metadata: {} });
+var entity = IPA.entity({ name: 'bogus' });
+var group_entity = IPA.entity({ name: 'group' });
module('aci', {
setup: function() {
@@ -74,6 +75,7 @@ module('aci', {
{
type: 'permission_target',
container_factory: IPA.details_table_section,
+ group_entity: group_entity,
name: 'target',
label: 'Target',
show_target: false
diff --git a/install/ui/test/association_tests.html b/install/ui/test/association_tests.html
index a25e417a..716efd31 100644
--- a/install/ui/test/association_tests.html
+++ b/install/ui/test/association_tests.html
@@ -13,6 +13,7 @@
<script type="text/javascript" src="../search.js"></script>
<script type="text/javascript" src="../add.js"></script>
<script type="text/javascript" src="../association.js"></script>
+ <script type="text/javascript" src="../entity.js"></script>
<script type="text/javascript" src="association_tests.js"></script>
</head>
<body>
diff --git a/install/ui/test/association_tests.js b/install/ui/test/association_tests.js
index ac517534..547ca9f8 100644
--- a/install/ui/test/association_tests.js
+++ b/install/ui/test/association_tests.js
@@ -27,11 +27,14 @@ test("Testing serial_associator().", function() {
var orig_ipa_batch_command = IPA.batch_command;
+ var user = IPA.entity({ name: 'user' });
+ var group = IPA.entity({ name: 'group' });
+
var params = {
method: 'add_member',
pkey: 'test',
- entity: {name:'user'},
- other_entity: 'group'
+ entity: user,
+ other_entity: group
};
params.values = ['user1', 'user2', 'user3'];
@@ -50,7 +53,7 @@ test("Testing serial_associator().", function() {
command = that.commands[i];
equals(
- command.entity, params.other_entity,
+ command.entity, params.other_entity.name,
'Checking IPA.command() parameter: entity');
equals(
@@ -86,11 +89,14 @@ test("Testing bulk_associator().", function() {
var counter = 0;
+ var user = IPA.entity({ name: 'user' });
+ var group = IPA.entity({ name: 'group' });
+
var params = {
- method: "add_member",
- pkey: "test",
- entity: {name:"user"},
- other_entity: "group"
+ method: 'add_member',
+ pkey: 'test',
+ entity: user,
+ other_entity: group
};
params.values = ['user1', 'user2', 'user3'];
@@ -111,7 +117,7 @@ test("Testing bulk_associator().", function() {
'Checking IPA.command() parameter: primary key');
equals(
- that.options[params.other_entity], 'user1,user2,user3',
+ that.options[params.other_entity.name], 'user1,user2,user3',
'Checking IPA.command() parameter: options[\""+params.other_entity+"\"]');
that.on_success({});
diff --git a/install/ui/test/details_tests.html b/install/ui/test/details_tests.html
index e95a573e..d8232cd7 100644
--- a/install/ui/test/details_tests.html
+++ b/install/ui/test/details_tests.html
@@ -15,7 +15,6 @@
<script type="text/javascript" src="../details.js"></script>
<script type="text/javascript" src="../facet.js"></script>
<script type="text/javascript" src="../entity.js"></script>
-
<script type="text/javascript" src="details_tests.js"></script>
</head>
<body>
diff --git a/install/ui/test/ipa_tests.html b/install/ui/test/ipa_tests.html
index cd8b5733..56f28b34 100644
--- a/install/ui/test/ipa_tests.html
+++ b/install/ui/test/ipa_tests.html
@@ -4,7 +4,6 @@
<title>Core Test Suite</title>
<link rel="stylesheet" href="qunit.css" type="text/css" media="screen">
<link rel="stylesheet" type="text/css" href="../jquery-ui.css" />
-
<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>
diff --git a/install/ui/test/ordered_map_tests.html b/install/ui/test/ordered_map_tests.html
index dda66934..77f955c1 100755
--- a/install/ui/test/ordered_map_tests.html
+++ b/install/ui/test/ordered_map_tests.html
@@ -4,7 +4,6 @@
<title>Ordered Map Test Suite</title>
<link rel="stylesheet" href="qunit.css" type="text/css" media="screen">
<link rel="stylesheet" type="text/css" href="../jquery-ui.css" />
-
<script type="text/javascript" src="qunit.js"></script>
<script type="text/javascript" src="../jquery.js"></script>
<script type="text/javascript" src="../jquery.ordered-map.js"></script>
diff --git a/install/ui/test/widget_tests.html b/install/ui/test/widget_tests.html
index e504f613..219608be 100755
--- a/install/ui/test/widget_tests.html
+++ b/install/ui/test/widget_tests.html
@@ -4,16 +4,13 @@
<title>Widget Test Suite</title>
<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="../jquery.ordered-map.js"></script>
<script type="text/javascript" src="../ipa.js"></script>
<script type="text/javascript" src="../widget.js"></script>
-
+ <script type="text/javascript" src="../entity.js"></script>
<script type="text/javascript" src="widget_tests.js"></script>
</head>
<body>
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']};
generated by cgit (git 2.34.1) at 2025-09-03 00:19:39 +0000