diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2013-04-12 17:29:29 +0200 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2013-05-06 16:22:25 +0200 |
commit | ffeafa6ec2974de5e3f2303fa8ffccf1638e9254 (patch) | |
tree | 5c7d4593c6555453d9b4df8419401ae109fc19af /install/ui/test | |
parent | f14393f427948169c596ddadc307074656b40631 (diff) | |
download | freeipa-ffeafa6ec2974de5e3f2303fa8ffccf1638e9254.tar.gz freeipa-ffeafa6ec2974de5e3f2303fa8ffccf1638e9254.tar.xz freeipa-ffeafa6ec2974de5e3f2303fa8ffccf1638e9254.zip |
Replace IPA.facet_builder with facets.builder
https://fedorahosted.org/freeipa/ticket/3235
Diffstat (limited to 'install/ui/test')
-rw-r--r-- | install/ui/test/details_tests.js | 19 | ||||
-rw-r--r-- | install/ui/test/entity_tests.js | 15 |
2 files changed, 23 insertions, 11 deletions
diff --git a/install/ui/test/details_tests.js b/install/ui/test/details_tests.js index 7326d553..1d453083 100644 --- a/install/ui/test/details_tests.js +++ b/install/ui/test/details_tests.js @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -define(['freeipa/ipa', 'freeipa/jquery', 'freeipa/details', - 'freeipa/entity'], function(IPA, $) { +define(['freeipa/ipa', 'freeipa/jquery','freeipa/facet', 'freeipa/facets', 'freeipa/details', + 'freeipa/entity'], function(IPA, $, mod_facet, facets) { return function() { var details_container; @@ -29,6 +29,14 @@ module('details', { setup: function() { IPA.ajax_options.async = false; + facets.register({ + type: 'details', + factory: IPA.details_facet, + pre_ops: [ + mod_facet.facet_preops.details + ] + }); + IPA.init({ url: 'data', on_error: function(xhr, text_status, error_thrown) { @@ -36,12 +44,6 @@ module('details', { } }); - IPA.nav = {}; - - IPA.nav.get_state = function(key){ - return $.bbq.getState(key); - }; - details_container = $('<div id="details"/>').appendTo(document.body); IPA.register('user', function(spec) { @@ -54,6 +56,7 @@ module('details', { }, teardown: function() { details_container.remove(); + facets.remove('details'); } }); diff --git a/install/ui/test/entity_tests.js b/install/ui/test/entity_tests.js index 26d73090..c9b7a104 100644 --- a/install/ui/test/entity_tests.js +++ b/install/ui/test/entity_tests.js @@ -19,8 +19,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -define(['freeipa/ipa', 'freeipa/jquery', 'freeipa/entity', 'freeipa/search', - 'freeipa/details'], function(IPA, $) { +define(['freeipa/ipa', 'freeipa/jquery','freeipa/facet', 'freeipa/facets', + 'freeipa/entity', 'freeipa/search', + 'freeipa/details'], function(IPA, $, mod_facet, facets) { return function() { var container; @@ -30,6 +31,14 @@ module('entity',{ IPA.ajax_options.async = false; + facets.register({ + type: 'search', + factory: IPA.search_facet, + pre_ops: [ + mod_facet.facet_preops.search + ] + }); + IPA.init({ url: 'data', on_success: function(data, text_status, xhr) { @@ -59,7 +68,7 @@ module('entity',{ }, teardown: function() { container.remove(); - + facets.remove('search'); } }); |