summaryrefslogtreecommitdiffstats
path: root/install/ui/test
diff options
context:
space:
mode:
authorAdam Young <ayoung@redhat.com>2011-05-23 10:39:09 -0400
committerAdam Young <ayoung@redhat.com>2011-05-23 13:31:23 -0400
commit03303390031ae88c9df3a0e14d85550884bb1740 (patch)
tree5f4fa206c61b909657d760de902d5f7bb136c25f /install/ui/test
parent0238cb845a724969990be3c8a45ef572296b5de1 (diff)
downloadfreeipa-03303390031ae88c9df3a0e14d85550884bb1740.tar.gz
freeipa-03303390031ae88c9df3a0e14d85550884bb1740.tar.xz
freeipa-03303390031ae88c9df3a0e14d85550884bb1740.zip
create entities on demand.
fixed changes from code review Fixed unit tests for entity on demand changes.
Diffstat (limited to 'install/ui/test')
-rw-r--r--install/ui/test/details_tests.js1
-rw-r--r--install/ui/test/entity_tests.js1
-rw-r--r--install/ui/test/navigation_tests.js9
3 files changed, 4 insertions, 7 deletions
diff --git a/install/ui/test/details_tests.js b/install/ui/test/details_tests.js
index 8f98f1fef..ca4658f87 100644
--- a/install/ui/test/details_tests.js
+++ b/install/ui/test/details_tests.js
@@ -43,7 +43,6 @@ module('details', {
return IPA.entity({name:obj_name,
metadata:IPA.metadata.objects.user});
};
- IPA.start_entities();
},
teardown: function() {
details_container.remove();
diff --git a/install/ui/test/entity_tests.js b/install/ui/test/entity_tests.js
index c258976f8..41e4d5e47 100644
--- a/install/ui/test/entity_tests.js
+++ b/install/ui/test/entity_tests.js
@@ -39,7 +39,6 @@ module('entity',{
columns:['uid']}).
build();
};
- IPA.start_entities();
},
function(xhr, text_status, error_thrown) {
ok(false, "ipa_init() failed: "+error_thrown);
diff --git a/install/ui/test/navigation_tests.js b/install/ui/test/navigation_tests.js
index 0f8f1be4a..d9bcc8eb6 100644
--- a/install/ui/test/navigation_tests.js
+++ b/install/ui/test/navigation_tests.js
@@ -20,6 +20,7 @@
module('navigation', {
+
setup: function() {
IPA.ajax_options.async = false;
IPA.init(
@@ -32,11 +33,14 @@ module('navigation', {
}
);
}
+
});
test("Testing IPA.navigation.create().", function() {
var entity;
+ var user_mock_called = false;
+ var group_mock_called = false;
IPA.entity_factories.user = function() {
var that = IPA.entity({name: 'user',
@@ -59,13 +63,8 @@ test("Testing IPA.navigation.create().", function() {
return that;
};
- IPA.start_entities();
-
- IPA.metadata = {};
var navigation_container = $('<div id="navigation"/>').appendTo(document.body);
var entity_container = $('<div id="content"/>').appendTo(document.body);
- var user_mock_called = false;
- var group_mock_called = false;
var navigation = IPA.navigation({
container: navigation_container,