summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2012-12-04 19:34:21 +0100
committerPetr Vobornik <pvoborni@redhat.com>2013-01-18 15:10:37 +0100
commit5d919c9556345a8c230dbd3c43b52a0b9f066773 (patch)
tree72eb825b9ee8c24429deb60f5b9e3701779ff089 /install
parentc71937fc0c2006c032948c564246822cb7344aa9 (diff)
downloadfreeipa-5d919c9556345a8c230dbd3c43b52a0b9f066773.tar.gz
freeipa-5d919c9556345a8c230dbd3c43b52a0b9f066773.tar.xz
freeipa-5d919c9556345a8c230dbd3c43b52a0b9f066773.zip
Change tests to use AMD loader
Test were modified accordingly to AMD changes. https://fedorahosted.org/freeipa/ticket/112
Diffstat (limited to 'install')
-rwxr-xr-xinstall/ui/test/aci_tests.html27
-rw-r--r--install/ui/test/aci_tests.js5
-rw-r--r--install/ui/test/all_tests.html63
-rw-r--r--install/ui/test/association_tests.html21
-rw-r--r--install/ui/test/association_tests.js6
-rwxr-xr-xinstall/ui/test/certificate_tests.html21
-rwxr-xr-xinstall/ui/test/certificate_tests.js5
-rw-r--r--install/ui/test/config.js43
-rw-r--r--install/ui/test/details_tests.html22
-rw-r--r--install/ui/test/details_tests.js6
-rw-r--r--install/ui/test/entity_tests.html24
-rw-r--r--install/ui/test/entity_tests.js4
-rw-r--r--install/ui/test/ip_tests.html10
-rw-r--r--install/ui/test/ip_tests.js7
-rw-r--r--install/ui/test/ipa_tests.html20
-rw-r--r--install/ui/test/ipa_tests.js6
-rw-r--r--install/ui/test/jsl.conf3
-rw-r--r--install/ui/test/navigation_tests.html21
-rw-r--r--install/ui/test/navigation_tests.js5
-rwxr-xr-xinstall/ui/test/ordered_map_tests.html13
-rwxr-xr-xinstall/ui/test/ordered_map_tests.js5
-rw-r--r--install/ui/test/utils_tests.html18
-rw-r--r--install/ui/test/utils_tests.js7
-rwxr-xr-xinstall/ui/test/widget_tests.html18
-rw-r--r--install/ui/test/widget_tests.js12
25 files changed, 243 insertions, 149 deletions
diff --git a/install/ui/test/aci_tests.html b/install/ui/test/aci_tests.html
index b57073039..996366ff7 100755
--- a/install/ui/test/aci_tests.html
+++ b/install/ui/test/aci_tests.html
@@ -4,23 +4,16 @@
<title>Access Control Interface 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="../field.js"></script>
- <script type="text/javascript" src="../widget.js"></script>
- <script type="text/javascript" src="../dialog.js"></script>
- <script type="text/javascript" src="../details.js"></script>
- <script type="text/javascript" src="../search.js"></script>
- <script type="text/javascript" src="../add.js"></script>
- <script type="text/javascript" src="../facet.js"></script>
- <script type="text/javascript" src="../entity.js"></script>
- <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>
+ <script type="text/javascript" src="../js/libs/jquery.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ba-bbq.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery-ui.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="../js/dojo/dojo.js"></script>
+
+ <script type="text/javascript">
+ require(['test/aci_tests'], function(tests){ tests() });
+ </script>
</head>
<body>
<h1 id="qunit-header">ACI Test Suite</h1>
diff --git a/install/ui/test/aci_tests.js b/install/ui/test/aci_tests.js
index 52fdc6037..fa1e971b1 100644
--- a/install/ui/test/aci_tests.js
+++ b/install/ui/test/aci_tests.js
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+define(['freeipa/ipa', 'freeipa/jquery', 'freeipa/aci'], function(IPA, $) {
+ return function() {
var target_container;
var target_widget;
@@ -286,5 +288,4 @@ test("Testing subtree target.", function() {
same(get_visible_rows(target_widget), ['memberof', 'subtree', 'attrs_multi'], 'subtree row visible');
});
-
-
+};}); \ No newline at end of file
diff --git a/install/ui/test/all_tests.html b/install/ui/test/all_tests.html
index e9061b6ca..0acd8b76d 100644
--- a/install/ui/test/all_tests.html
+++ b/install/ui/test/all_tests.html
@@ -4,35 +4,40 @@
<title>Complete 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="../net.js"></script>
- <script type="text/javascript" src="../ipa.js"></script>
- <script type="text/javascript" src="../widget.js"></script>
- <script type="text/javascript" src="../field.js"></script>
- <script type="text/javascript" src="../dialog.js"></script>
- <script type="text/javascript" src="../details.js"></script>
- <script type="text/javascript" src="../search.js"></script>
- <script type="text/javascript" src="../add.js"></script>
- <script type="text/javascript" src="../facet.js"></script>
- <script type="text/javascript" src="../entity.js"></script>
- <script type="text/javascript" src="../association.js"></script>
- <script type="text/javascript" src="../navigation.js"></script>
- <script type="text/javascript" src="../certificate.js"></script>
- <script type="text/javascript" src="../aci.js"></script>
- <script type="text/javascript" src="ordered_map_tests.js"></script>
- <script type="text/javascript" src="ipa_tests.js"></script>
- <script type="text/javascript" src="details_tests.js"></script>
- <script type="text/javascript" src="entity_tests.js"></script>
- <script type="text/javascript" src="association_tests.js"></script>
- <script type="text/javascript" src="navigation_tests.js"></script>
- <script type="text/javascript" src="certificate_tests.js"></script>
- <script type="text/javascript" src="aci_tests.js"></script>
- <script type="text/javascript" src="widget_tests.js"></script>
- <script type="text/javascript" src="ip_tests.js"></script>
- <script type="text/javascript" src="utils_tests.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ba-bbq.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery-ui.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="../js/dojo/dojo.js"></script>
+
+ <script type="text/javascript">
+ require([
+ 'test/ordered_map_tests',
+ 'test/ipa_tests',
+ 'test/details_tests',
+ 'test/entity_tests',
+ 'test/association_tests',
+ 'test/navigation_tests',
+ 'test/certificate_tests',
+ 'test/aci_tests',
+ 'test/widget_tests',
+ 'test/ip_tests',
+ 'test/utils_tests'
+ ], function(om, ipa, details, entity, as, nav, cert, aci, wid, ip, ut){
+ om();
+ ipa();
+ details();
+ entity();
+ as();
+ nav();
+ cert();
+ aci();
+ wid();
+ ip();
+ ut();
+ });
+ </script>
</head>
<body>
<h1 id="qunit-header">Complete Test Suite</h1>
diff --git a/install/ui/test/association_tests.html b/install/ui/test/association_tests.html
index 716efd31d..13fd53027 100644
--- a/install/ui/test/association_tests.html
+++ b/install/ui/test/association_tests.html
@@ -4,17 +4,16 @@
<title>Association 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="../details.js"></script>
- <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>
+ <script type="text/javascript" src="../js/libs/jquery.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ba-bbq.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery-ui.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="../js/dojo/dojo.js"></script>
+
+ <script type="text/javascript">
+ require(['test/association_tests'], function(tests){ tests() });
+ </script>
</head>
<body>
<h1 id="qunit-header">Association Test Suite</h1>
diff --git a/install/ui/test/association_tests.js b/install/ui/test/association_tests.js
index 547ca9f8b..40daacee8 100644
--- a/install/ui/test/association_tests.js
+++ b/install/ui/test/association_tests.js
@@ -18,6 +18,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
+define(['freeipa/ipa', 'freeipa/jquery', 'freeipa/association', 'freeipa/entity'], function(IPA, $) {
+ return function() {
+
module('association');
@@ -135,3 +139,5 @@ test("Testing bulk_associator().", function() {
IPA.command = orig_ipa_command;
});
+
+};}); \ No newline at end of file
diff --git a/install/ui/test/certificate_tests.html b/install/ui/test/certificate_tests.html
index dd8ccb6e3..23672862c 100755
--- a/install/ui/test/certificate_tests.html
+++ b/install/ui/test/certificate_tests.html
@@ -4,17 +4,16 @@
<title>Certificate 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="../details.js"></script>
- <script type="text/javascript" src="../search.js"></script>
- <script type="text/javascript" src="../add.js"></script>
- <script type="text/javascript" src="../navigation.js"></script>
- <script type="text/javascript" src="../certificate.js"></script>
- <script type="text/javascript" src="certificate_tests.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ba-bbq.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery-ui.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="../js/dojo/dojo.js"></script>
+
+ <script type="text/javascript">
+ require(['test/certificate_tests'], function(tests){ tests() });
+ </script>
</head>
<body>
<h1 id="qunit-header">Certificate Test Suite</h1>
diff --git a/install/ui/test/certificate_tests.js b/install/ui/test/certificate_tests.js
index a3893d3d9..71e1c8deb 100755
--- a/install/ui/test/certificate_tests.js
+++ b/install/ui/test/certificate_tests.js
@@ -18,6 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+define(['freeipa/ipa', 'freeipa/jquery', 'freeipa/certificate'], function(IPA, $) {
+ return function() {
+
module('certificate');
test("Testing certificate_parse_dn().", function() {
@@ -70,3 +73,5 @@ test("Testing certificate_parse_dn().", function() {
},
"Checking IPA.cert.parse_dn('cn=John Smith,ou=Developers,ou=Users,dc=example,dc=com')");
});
+
+};}); \ No newline at end of file
diff --git a/install/ui/test/config.js b/install/ui/test/config.js
new file mode 100644
index 000000000..620de8c8e
--- /dev/null
+++ b/install/ui/test/config.js
@@ -0,0 +1,43 @@
+/* Authors:
+ * Petr Vobornik <pvoborni@redhat.com>
+ *
+ * Copyright (C) 2012 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, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+*/
+
+var dojoConfig= {
+ baseUrl: "../js",
+ has: {
+ 'dojo-firebug': false,
+ 'dojo-debug-messages': true
+ },
+ parseOnLoad: false,
+ async: true,
+ packages: [
+ {
+ name:'dojo',
+ location:'dojo'
+ },
+ {
+ name: 'freeipa',
+ location: 'freeipa'
+ },
+ {
+ name: 'test',
+ location: '../test'
+ }
+ ]
+}; \ No newline at end of file
diff --git a/install/ui/test/details_tests.html b/install/ui/test/details_tests.html
index d8232cd72..fb9fbc5bd 100644
--- a/install/ui/test/details_tests.html
+++ b/install/ui/test/details_tests.html
@@ -4,18 +4,16 @@
<title>Details 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="../field.js"></script>
- <script type="text/javascript" src="../widget.js"></script>
- <script type="text/javascript" src="../dialog.js"></script>
- <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>
+ <script type="text/javascript" src="../js/libs/jquery.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ba-bbq.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery-ui.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="../js/dojo/dojo.js"></script>
+
+ <script type="text/javascript">
+ require(['test/details_tests'], function(tests){ tests() });
+ </script>
</head>
<body>
<h1 id="qunit-header">Details Test Suite</h1>
diff --git a/install/ui/test/details_tests.js b/install/ui/test/details_tests.js
index 60c899e60..05308be60 100644
--- a/install/ui/test/details_tests.js
+++ b/install/ui/test/details_tests.js
@@ -18,6 +18,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+define(['freeipa/ipa', 'freeipa/jquery', 'freeipa/details',
+ 'freeipa/entity'], function(IPA, $) {
+ return function() {
+
var details_container;
@@ -352,3 +356,5 @@ test("Testing IPA.details_section_create again()",function() {
'Verifying field '+field.name+' was created');
}
});
+
+};}); \ No newline at end of file
diff --git a/install/ui/test/entity_tests.html b/install/ui/test/entity_tests.html
index 1b4918890..8d73d995e 100644
--- a/install/ui/test/entity_tests.html
+++ b/install/ui/test/entity_tests.html
@@ -4,20 +4,16 @@
<title>Entity 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.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="../dialog.js"></script>
- <script type="text/javascript" src="../details.js"></script>
- <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="../navigation.js"></script>
- <script type="text/javascript" src="../facet.js"></script>
- <script type="text/javascript" src="../entity.js"></script>
- <script type="text/javascript" src="entity_tests.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ba-bbq.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery-ui.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="../js/dojo/dojo.js"></script>
+
+ <script type="text/javascript">
+ require(['test/entity_tests'], function(tests){ tests() });
+ </script>
</head>
<body>
<h1 id="qunit-header">Entity Test Suite</h1>
diff --git a/install/ui/test/entity_tests.js b/install/ui/test/entity_tests.js
index a81e0b892..f34060f79 100644
--- a/install/ui/test/entity_tests.js
+++ b/install/ui/test/entity_tests.js
@@ -19,6 +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, $) {
+ return function() {
var entities_container;
@@ -100,3 +103,4 @@ test('Testing IPA.entity_set_search_definition().', function() {
});
+};});
diff --git a/install/ui/test/ip_tests.html b/install/ui/test/ip_tests.html
index 76ba2a590..3f91bfdea 100644
--- a/install/ui/test/ip_tests.html
+++ b/install/ui/test/ip_tests.html
@@ -4,8 +4,14 @@
<title>IP addresses 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="../net.js"></script>
- <script type="text/javascript" src="ip_tests.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="../js/dojo/dojo.js"></script>
+
+ <script type="text/javascript">
+ require(['test/ip_tests'], function(tests){ tests() });
+ </script>
</head>
<body>
<h1 id="qunit-header">IP addresses test suite</h1>
diff --git a/install/ui/test/ip_tests.js b/install/ui/test/ip_tests.js
index 74fe7c2be..f7564e690 100644
--- a/install/ui/test/ip_tests.js
+++ b/install/ui/test/ip_tests.js
@@ -18,6 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+define(['freeipa/ipa', 'freeipa/net'], function(IPA, NET) {
+ return function() {
+
module('ip-addresses',{
setup: function() {
},
@@ -300,4 +303,6 @@ test('Usage - set address.parts, no type', function() {
address.parse();
ok(!address.valid, 'Still invalid');
same(address.type, null, 'Checking type');
-}); \ No newline at end of file
+});
+
+};}); \ No newline at end of file
diff --git a/install/ui/test/ipa_tests.html b/install/ui/test/ipa_tests.html
index 56f28b34d..31b208d0e 100644
--- a/install/ui/test/ipa_tests.html
+++ b/install/ui/test/ipa_tests.html
@@ -5,16 +5,16 @@
<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>
- <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="../field.js"></script>
- <script type="text/javascript" src="../widget.js"></script>
- <script type="text/javascript" src="../details.js"></script>
- <script type="text/javascript" src="../dialog.js"></script>
- <script type="text/javascript" src="ipa_tests.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ba-bbq.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery-ui.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="../js/dojo/dojo.js"></script>
+
+ <script type="text/javascript">
+ require(['test/ipa_tests'], function(tests){ tests() });
+ </script>
</head>
<body>
<h1 id="qunit-header">Core Test Suite</h1>
diff --git a/install/ui/test/ipa_tests.js b/install/ui/test/ipa_tests.js
index 478196caf..258abe7d6 100644
--- a/install/ui/test/ipa_tests.js
+++ b/install/ui/test/ipa_tests.js
@@ -18,6 +18,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+define(['freeipa/ipa', 'freeipa/jquery', 'freeipa/dialog', 'freeipa/widget',
+ 'freeipa/details'], function(IPA, $) {
+ return function() {
+
module('ipa');
test("Testing ipa_init().", function() {
@@ -304,3 +308,5 @@ test("Testing observer.", function() {
obj.event.detach(func);
obj.event.notify([param1_value, param2_value], obj);
});
+
+};}); \ No newline at end of file
diff --git a/install/ui/test/jsl.conf b/install/ui/test/jsl.conf
index 768a295f1..94ac10c50 100644
--- a/install/ui/test/jsl.conf
+++ b/install/ui/test/jsl.conf
@@ -126,9 +126,10 @@
+define strictEqual
+define deepEqual
+define equals
-+define IPA
+define expect
++define IPA
+define NET
++define define
### Files
diff --git a/install/ui/test/navigation_tests.html b/install/ui/test/navigation_tests.html
index 9d7f1d0d9..d38182900 100644
--- a/install/ui/test/navigation_tests.html
+++ b/install/ui/test/navigation_tests.html
@@ -4,17 +4,16 @@
<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="../jquery.ordered-map.js"></script>
- <script type="text/javascript" src="../ipa.js"></script>
- <script type="text/javascript" src="../facet.js"></script>
- <script type="text/javascript" src="../entity.js"></script>
- <script type="text/javascript" src="../navigation.js"></script>
- <script type="text/javascript" src="../search.js"></script>
- <script type="text/javascript" src="../widget.js"></script>
- <script type="text/javascript" src="navigation_tests.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ba-bbq.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery-ui.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="../js/dojo/dojo.js"></script>
+
+ <script type="text/javascript">
+ require(['test/navigation_tests'], function(tests){ tests() });
+ </script>
</head>
<body>
<h1 id="qunit-header">Navigation Test Suite</h1>
diff --git a/install/ui/test/navigation_tests.js b/install/ui/test/navigation_tests.js
index 2fb1e814a..309a0a634 100644
--- a/install/ui/test/navigation_tests.js
+++ b/install/ui/test/navigation_tests.js
@@ -18,6 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+define(['freeipa/ipa', 'freeipa/jquery', 'freeipa/navigation', 'freeipa/entity'],
+ function(IPA, $) {
+ return function() {
module('navigation', {
@@ -218,3 +221,5 @@ test("Testing IPA.navigation.update() with out-of-range index.", function() {
entity_container.remove();
navigation_container.remove();
});
+
+};}); \ No newline at end of file
diff --git a/install/ui/test/ordered_map_tests.html b/install/ui/test/ordered_map_tests.html
index 77f955c1f..3b019e6e0 100755
--- a/install/ui/test/ordered_map_tests.html
+++ b/install/ui/test/ordered_map_tests.html
@@ -5,9 +5,16 @@
<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>
- <script type="text/javascript" src="ordered_map_tests.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ba-bbq.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery-ui.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="../js/dojo/dojo.js"></script>
+
+ <script type="text/javascript">
+ require(['test/ordered_map_tests'], function(tests){ tests() });
+ </script>
</head>
<body>
<h1 id="qunit-header">Ordered Map Test Suite</h1>
diff --git a/install/ui/test/ordered_map_tests.js b/install/ui/test/ordered_map_tests.js
index b708a1283..e8d8a7460 100755
--- a/install/ui/test/ordered_map_tests.js
+++ b/install/ui/test/ordered_map_tests.js
@@ -18,6 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+define(['freeipa/jquery'], function($) {
+ return function() {
+
module('ordered_map');
test("Testing $.ordered_map constructor.", function() {
@@ -126,3 +129,5 @@ test("Testing $.ordered_map.empty().", function() {
deepEqual(test.values, [], 'Checking values.');
deepEqual(test.map, {}, 'Checking map.');
});
+
+};}); \ No newline at end of file
diff --git a/install/ui/test/utils_tests.html b/install/ui/test/utils_tests.html
index 5b81cc359..56616815e 100644
--- a/install/ui/test/utils_tests.html
+++ b/install/ui/test/utils_tests.html
@@ -3,15 +3,17 @@
<head>
<title>IPA utils test suite</title>
<link rel="stylesheet" href="qunit.css" type="text/css" media="screen">
- <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="qunit.js"></script>
- <script type="text/javascript" src="../ipa.js"></script>
- <script type="text/javascript" src="../widget.js"></script>
- <script type="text/javascript" src="../field.js"></script>
- <script type="text/javascript" src="utils_tests.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ba-bbq.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery-ui.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="../js/dojo/dojo.js"></script>
+
+ <script type="text/javascript">
+ require(['test/utils_tests'], function(tests){ tests() });
+ </script>
</head>
<body>
<h1 id="qunit-header">IPA utils test suite</h1>
diff --git a/install/ui/test/utils_tests.js b/install/ui/test/utils_tests.js
index ff4fd2a3b..c93b89c39 100644
--- a/install/ui/test/utils_tests.js
+++ b/install/ui/test/utils_tests.js
@@ -18,6 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+define(['freeipa/ipa', 'freeipa/jquery', 'freeipa/field', 'freeipa/widget'],
+ function(IPA, $) { return function() {
+
var old;
module('utils',{
@@ -133,4 +136,6 @@ test('Testing IPA.defined', function() {
same(IPA.defined('', true), false, 'Empty string - checking');
same(IPA.defined(undefined), false, 'undefined');
same(IPA.defined(null), false, 'null');
-}); \ No newline at end of file
+});
+
+};}); \ No newline at end of file
diff --git a/install/ui/test/widget_tests.html b/install/ui/test/widget_tests.html
index 219608be1..50d156f51 100755
--- a/install/ui/test/widget_tests.html
+++ b/install/ui/test/widget_tests.html
@@ -4,14 +4,16 @@
<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>
+ <script type="text/javascript" src="../js/libs/jquery.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ba-bbq.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery-ui.js"></script>
+ <script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="../js/dojo/dojo.js"></script>
+
+ <script type="text/javascript">
+ require(['test/widget_tests'], function(tests){ tests() });
+ </script>
</head>
<body>
<h1 id="qunit-header">Widget Test Suite</h1>
diff --git a/install/ui/test/widget_tests.js b/install/ui/test/widget_tests.js
index 7ed93608e..17ee15436 100644
--- a/install/ui/test/widget_tests.js
+++ b/install/ui/test/widget_tests.js
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+define(['freeipa/ipa', 'freeipa/jquery', 'freeipa/field', 'freeipa/widget',
+ 'freeipa/entity'],
+ function(IPA, $) { return function() {
var widget_container;
var widget;
@@ -350,11 +353,4 @@ test("IPA.radio_widget" ,function(){
});
-
-
-
-
-
-
-
-
+};}); \ No newline at end of file