Imported Upstream version 4.3.1

install/ui/test/aci_tests.js

@@ -39,8 +39,8 @@ var target_facet;
 var entity = IPA.entity({ name: 'bogus', redirect_facet: 'details' });
 var group_entity = IPA.entity({ name: 'group' });
 
-QUnit.module('aci', {
-        beforeEach: function(assert) {
+module('aci', {
+        setup: function() {
 
             fields.register();
             widgets.register();
@@ -52,7 +52,7 @@ QUnit.module('aci', {
             IPA.init({
                 url: 'data',
                 on_error: function(xhr, text_status, error_thrown) {
-                    assert.ok(false, "ipa_init() failed: "+error_thrown);
+                    ok(false, "ipa_init() failed: "+error_thrown);
                 }
             });
 
@@ -130,13 +130,13 @@ QUnit.module('aci', {
             target_facet.create();
             target_widget = target_facet.widgets.get_widget('target');
         },
-        afterEach: function() {
+        teardown: function() {
             target_container.remove();
         }}
 );
 
 
-QUnit.test("aci.attributes_widget", function(assert) {
+test("aci.attributes_widget", function() {
 
     var aciattrs = md.source.objects.user.aciattrs;
 
@@ -152,19 +152,17 @@ QUnit.test("aci.attributes_widget", function(assert) {
 
     widget.create(container);
 
-    var list = $('ul', container);
+    var table = $('table', container);
 
-    assert.ok(
-        list,
-        'Widget contains list');
+    ok(
+        table,
+        'Widget contains table');
 
-    widget.update([]);
+    widget.update({});
+    var tr = $('tbody tr', table);
 
-    list = $('ul', container); // reload the DOM node which contains options
-    var li = $('li', list);
-
-    assert.deepEqual(
-        li.length, aciattrs.length,
+    same(
+        tr.length, aciattrs.length,
         'Widget contains all user ACI attributes');
 
     var record = {
@@ -175,25 +173,24 @@ QUnit.test("aci.attributes_widget", function(assert) {
         ]
     };
 
-    assert.deepEqual(
+    same(
         widget.save(), [],
-        'Widget has no initialy checked values');
+        'Widget has no initial values');
 
     widget.update(record.attrs);
 
-    list = $('ul', container); // reload the DOM node which contains options
-    li = $('li', list);
+    tr = $('tbody tr', table);
 
-    assert.deepEqual(
-        li.length, aciattrs.length+1,
+    same(
+        tr.length, aciattrs.length+1,
         'Widget contains all user ACI attributes plus 1 unmatched attribute');
 
-    assert.deepEqual(
+    same(
         widget.save(), record.attrs.sort(),
         'All loaded values are saved and sorted');
 });
 
-QUnit.test("aci.rights_widget.", function(assert) {
+test("aci.rights_widget.", function() {
 
     var container = $('<span/>', {
         name: 'permissions'
@@ -208,7 +205,7 @@ QUnit.test("aci.rights_widget.", function(assert) {
 
     var inputs = $('input', container);
 
-    assert.deepEqual(
+    same(
         inputs.length, widget.rights.length,
         'Widget displays all permissions');
 });
@@ -231,7 +228,7 @@ var get_visible_rows = function(section) {
 };
 
 
-QUnit.test("Testing type target.", function(assert) {
+test("Testing type target.", function() {
     var data = {
         id: null,
         error: null,
@@ -240,11 +237,11 @@ QUnit.test("Testing type target.", function(assert) {
 
     target_facet.load(data);
 
-    assert.deepEqual(target_widget.target, 'type', 'type selected');
+    same(target_widget.target, 'type', 'type selected');
 
     var attrs_w = target_widget.widgets.get_widget('attrs');
     var options = attrs_w.options;
-    assert.ok(options.length > 0, "Attrs has some options");
+    ok(options.length > 0, "Attrs has some options");
     // check them all
     var values = [];
     for (var i=0,l=options.length; i<l; i++) {
@@ -256,18 +253,18 @@ QUnit.test("Testing type target.", function(assert) {
     var record = {};
     target_facet.save(record);
 
-    assert.deepEqual(record.type[0], data.result.result.type,
+    same(record.type[0], data.result.result.type,
          "saved type matches sample data");
 
-    assert.deepEqual(get_visible_rows(target_widget), ['type', 'extratargetfilter',
+    same(get_visible_rows(target_widget), ['type', 'extratargetfilter',
         'ipapermtarget', 'memberof', 'attrs'],
         'type and attrs rows visible');
 
-    assert.deepEqual(record.attrs.length, options.length, "response contains all checked attrs");
+    same(record.attrs.length, options.length, "response contains all checked attrs");
 });
 
 
-QUnit.test("Testing general target.", function(assert) {
+test("Testing general target.", function() {
 
     var data = {
         id: null,
@@ -280,13 +277,13 @@ QUnit.test("Testing general target.", function(assert) {
     var record = {};
     target_facet.save(record);
 
-    assert.deepEqual(target_widget.target, 'general', 'general selected');
+    same(target_widget.target, 'general', 'general selected');
 
-    assert.deepEqual(get_visible_rows(target_widget), ['type', 'ipapermlocation',
+    same(get_visible_rows(target_widget), ['type', 'ipapermlocation',
         'extratargetfilter', 'ipapermtarget', 'memberof',
         'attrs_multi'], 'general target fields visible');
 
-    assert.deepEqual(record.extratargetfilter[0], data.result.result.extratargetfilter, 'filter set correctly');
+    same(record.extratargetfilter[0], data.result.result.extratargetfilter, 'filter set correctly');
 });
 
-};});
+};});