On 09/28/2010 07:23 PM, Adam Young wrote:
    tab objects
Convert the tab lists to arrays of objects with four potential fields:


    tab[0] -> tab.name
    tab[1] -> tab.label
    tab[2] -> tab.setup or tab.children


_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
Added unit tests
From 1e8a61d2a77362a0eec042a9859b31560d2b4263 Mon Sep 17 00:00:00 2001
From: Adam Young <ayo...@redhat.com>
Date: Tue, 28 Sep 2010 19:20:02 -0400
Subject: [PATCH] tab objects
 Convert the tab lists to arrays of objects with four potential fields:

tab[0] -> tab.name
tab[1] -> tab.label
tab[2] -> tab.setup or tab.children

Added unit tests for nav_setup and nav_select_tab
---
 install/static/navigation.js              |   25 +++++-----
 install/static/test/navigation_tests.html |   21 ++++++++
 install/static/test/navigation_tests.js   |   75 +++++++++++++++++++++++++++++
 install/static/webui.js                   |   50 ++++++++++---------
 4 files changed, 136 insertions(+), 35 deletions(-)
 create mode 100644 install/static/test/navigation_tests.html
 create mode 100644 install/static/test/navigation_tests.js

diff --git a/install/static/navigation.js b/install/static/navigation.js
index 683c872..169729b 100644
--- a/install/static/navigation.js
+++ b/install/static/navigation.js
@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
+
 function nav_create(nls, container, tabclass)
 {
     if (!container)
@@ -50,21 +51,21 @@ function nav_generate_tabs(nls, container, tabclass, depth)
     for (var i = 0; i < nls.length; ++i) {
         var n = nls[i];
 
-        var name = n[1];
-        if ((ipa_objs[n[0]]) && (ipa_objs[n[0]].label)){
-            name = ipa_objs[n[0]].label;
+        var name = n.name;
+        if ((ipa_objs[n.name]) && (ipa_objs[n.name].label)){
+            name = ipa_objs[n.name].label;
         }
 
-        var li = nav_create_tab_li(n[0], name);
+        var li = nav_create_tab_li(n.name, name);
         ul.append(li);
 
-        var div = nav_create_tab_div(n[0]);
+        var div = nav_create_tab_div(n.name);
         container.append(div);
 
-        if (typeof n[2] == 'function') {
-            n[2](div);
-        } else if (n[2].length) {
-            nav_generate_tabs(n[2], div, tabclass, depth +1 );
+        if (n.setup) {
+            n.setup(div);
+        } else if (n.children) {
+            nav_generate_tabs(n.children, div, tabclass, depth +1 );
         }
     }
 }
@@ -95,10 +96,10 @@ function nav_select_tabs(nls, container)
     for (var i = 0; i < nls.length; ++i) {
         var n = nls[i];
 
-        var div = $('#'+n[0]);
+        var div = $('#'+n.name);
 
-        if (typeof n[2] != 'function' && n[2].length) {
-            nav_select_tabs(n[2], div);
+        if ( (!n.setup) && n.children) {
+            nav_select_tabs(n.children, div);
         }
     }
 }
diff --git a/install/static/test/navigation_tests.html b/install/static/test/navigation_tests.html
new file mode 100644
index 0000000..dbb562f
--- /dev/null
+++ b/install/static/test/navigation_tests.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Navigation 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="../navigation.js"></script>
+    <script type="text/javascript" src="navigation_tests.js"></script>
+</head>
+<body>
+    <h1 id="qunit-header">Navigation Test Suite</h1>
+    <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
+    <div id="qunit-fixture">test markup</div>
+</body>
+</html>
diff --git a/install/static/test/navigation_tests.js b/install/static/test/navigation_tests.js
new file mode 100644
index 0000000..16b3ae9
--- /dev/null
+++ b/install/static/test/navigation_tests.js
@@ -0,0 +1,75 @@
+/*  Authors:
+ *    Adam Young <ayo...@redhat.com>
+ *
+ * Copyright (C) 2010 Red Hat
+ * see file 'COPYING' for use and warranty information
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 only
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+
+
+test("Testing nav_create().", function() {
+
+    var mock_tabs_lists =
+        [
+            { name:'identity', label:'IDENTITY', children: [
+                {name:'user', label:'Users', setup:mock_setup_user},
+                {name:'group', label:'Users', setup:mock_setup_group},
+            ]}];
+    function  mock_setup_user (jobj){
+        user_mock_called = true;
+        same(jobj[0].id,'user','user id');
+        same(jobj[0].nodeName,'DIV','user div');
+    }
+    function  mock_setup_group (jobj){
+        group_mock_called = true;
+        same(jobj[0].id,'group','group id');
+        same(jobj[0].nodeName,'DIV','group Div');
+
+    }
+    ipa_objs= {};
+    var navigation = $('<div id="navigation"/>');
+    var user_mock_called = false;
+    var group_mock_called = false;
+    nav_create(mock_tabs_lists, navigation, 'tabs')
+    ok(user_mock_called, "mock setup was called");
+    ok(group_mock_called, "mock setup was called");
+    same( navigation[0].children.length, 2, "Two Child tabs");
+    same( navigation[0].children[1].id, 'identity', "Identity Tab");
+    same( navigation[0].children[1].children[1].id, 'user', "User Tab");
+    same( navigation[0].children[1].children[2].id, 'group', "User Tab");
+
+});
+
+test("Testing  nav_select_tabs().", function() {
+
+
+    var mock_tabs_lists =
+        [
+            { name:'identity', label:'IDENTITY', children: [
+                {name:'one', label:'One', setup: function (){}},
+                {name:'two', label:'Two', setup: function (){}},
+            ]}];
+
+    var navigation = $('<div id="navigation"/>');
+
+    nav_create(mock_tabs_lists, navigation, 'tabs')
+
+    $.bbq.pushState({"identity":2});
+    nav_select_tabs(mock_tabs_lists, navigation);
+    same( navigation[0].children[1].children[2].id, 'two', "Tab two");
+
+});
diff --git a/install/static/webui.js b/install/static/webui.js
index aa17b41..331ec82 100644
--- a/install/static/webui.js
+++ b/install/static/webui.js
@@ -21,26 +21,30 @@
 /* REQUIRES: everything, this file puts it all togheter */
 
 /* tabs definition for IPA webUI */
-var admin_tabs_lists = [
-    ['identity', 'IDENTITY', [
-        ['user', 'Users', ipa_entity_setup],
-        ['group', 'Groups', ipa_entity_setup],
-        ['host', 'Hosts', ipa_entity_setup],
-        ['hostgroup', 'Hostgroups', ipa_entity_setup],
-        ['netgroup', 'Netgroups', ipa_entity_setup],
-        ['service', 'Services', ipa_entity_setup],
-    ]],
-    ['policy', 'POLICY', unimplemented_tab],
-    ['config', 'CONFIG', [
-        ['rolegroup', 'Rolegroups', ipa_entity_setup]
-    ]]
+
+
+var admin_tab_set = [
+    {name:'identity', label:'IDENTITY', children:[
+        {name:'user', label:'Users', setup: ipa_entity_setup},
+        {name:'group', label:'Groups', setup: ipa_entity_setup},
+        {name:'host', label:'Hosts', setup: ipa_entity_setup},
+        {name:'hostgroup', label:'Hostgroups', setup: ipa_entity_setup},
+        {name:'netgroup', label:'Netgroups', setup: ipa_entity_setup},
+        {name:'service', label:'Services', setup: ipa_entity_setup},
+    ]},
+    {name:'policy', label:'POLICY', setup: unimplemented_tab},
+    {name:'config', label:'CONFIG', children: [
+        {name:'rolegroup', label:'Rolegroups', setup: ipa_entity_setup}
+    ]}
 ];
 
 
+
+
 var self_serv_tabs_lists =
     [
-    ['identity', 'IDENTITY', [
-        ['user', 'Users', ipa_entity_setup]]]];
+        { name:'identity', label:'IDENTITY', children: [
+            {name:'user', label:'Users', setup:ipa_entity_setup}]}];
 
 var nav_tabs_lists;
 
@@ -59,9 +63,9 @@ $(function() {
                 {'user-facet':'details', 'user-pkey':whoami_pkey},2);
             if (whoami.hasOwnProperty('memberof_rolegroup') &&
                 whoami.memberof_rolegroup.length > 0){
-                nav_tabs_lists = admin_tabs_lists;
+                nav_tabs_lists = admin_tab_set;
             }else{
-                nav_tabs_lists = self_serv_tabs_lists;
+                nav_tabs_lists = self_serv_tab_set;
 
                 var state = {'user-pkey':whoami_pkey ,
                              'user-facet': jQuery.bbq.getState('user-facet') ||
@@ -106,12 +110,12 @@ function window_hashchange(evt)
 
     for (var i = 0; i < nav_tabs_lists.length; ++i) {
         var t = nav_tabs_lists[i];
-        if (typeof t[2] != 'function' && t[2].length) {
-            for (var j = 0; j < t[2].length; ++j) {
-                var tt = t[2][j];
-                var obj_name = tt[0];
-                var entity_setup = tt[2];
-                var div = $('#' + tt[0]);
+        if (!(t.setup) && t.children) {
+            for (var j = 0; j < t.children.length; ++j) {
+                var tt = t.children[j];
+                var obj_name = tt.name;
+                var entity_setup = tt.setup;
+                var div = $('#' + tt.name);
 
                 var state = obj_name + '-facet';
                 var facet = $.bbq.getState(state, true) || 'search';
-- 
1.7.1

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to