summaryrefslogtreecommitdiff
path: root/js_tests
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2020-03-07 09:35:59 -0800
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-03-09 12:34:32 +0100
commiteb77e80de01e658541d4fcc3b0b38783ce4e6a7e (patch)
tree6869c01ea81c831ea04e2daa9cfd93b54de9754f /js_tests
parentec292f261d2390f692d5534ca85a427216bc4e39 (diff)
Fixed #31349 -- Used :nth-child() CSS pseudo-class to style alternative rows in admin.
Diffstat (limited to 'js_tests')
-rw-r--r--js_tests/admin/inlines.test.js26
-rw-r--r--js_tests/tests.html6
2 files changed, 8 insertions, 24 deletions
diff --git a/js_tests/admin/inlines.test.js b/js_tests/admin/inlines.test.js
index 582ede1465..7a04e870bb 100644
--- a/js_tests/admin/inlines.test.js
+++ b/js_tests/admin/inlines.test.js
@@ -28,14 +28,14 @@ QUnit.test('add form', function(assert) {
var addButton = this.table.find('.add-row a');
assert.equal(addButton.text(), this.addText);
addButton.click();
- assert.ok(this.table.find('#first-1').hasClass('row2'));
+ assert.ok(this.table.find('#first-1'));
});
QUnit.test('added form has remove button', function(assert) {
var addButton = this.table.find('.add-row a');
assert.equal(addButton.text(), this.addText);
addButton.click();
- assert.equal(this.table.find('#first-1.row2 .inline-deletelink').length, 1);
+ assert.equal(this.table.find('#first-1 .inline-deletelink').length, 1);
});
QUnit.test('add/remove form events', function(assert) {
@@ -45,11 +45,11 @@ QUnit.test('add/remove form events', function(assert) {
var addButton = this.table.find('.add-row a');
$document.on('formset:added', function(event, $row, formsetName) {
assert.ok(true, 'event `formset:added` triggered');
- assert.equal(true, $row.is($('.row2')));
+ assert.equal(true, $row.is('#first-1'));
assert.equal(formsetName, 'first');
});
addButton.click();
- var deletedRow = $('.row2');
+ var deletedRow = $('#first-1');
var deleteLink = this.table.find('.inline-deletelink');
$document.on('formset:removed', function(event, $row, formsetName) {
assert.ok(true, 'event `formset:removed` triggered');
@@ -74,7 +74,7 @@ QUnit.test('existing add button', function(assert) {
});
assert.equal(this.table.find('.add-row a').length, 0);
addButton.click();
- assert.ok(this.table.find('#first-1').hasClass('row2'));
+ assert.ok(this.table.find('#first-1'));
});
@@ -125,22 +125,6 @@ QUnit.test('removing a form-row also removed related row with non-field errors',
assert.notOk(this.table.find('.row-form-errors').length);
});
-QUnit.test('removing and adding a row keeps cycling row1 and row2 classes', function(assert) {
- var $ = django.jQuery;
- var tr = this.inlineRows.slice(1, 2);
- var deleteLink = tr.find('a.inline-deletelink');
- var addLink = this.table.find('.add-row > td > a');
- assert.ok(this.table.find('tr.form-row:even').hasClass('row1'));
- assert.ok(this.table.find('tr.form-row:odd').hasClass('row2'));
- deleteLink.trigger($.Event('click', {target: deleteLink}));
- assert.ok(this.table.find('tr.form-row:even').hasClass('row1'));
- assert.ok(this.table.find('tr.form-row:odd').hasClass('row2'));
- addLink.trigger($.Event('click', {target: addLink}));
- assert.ok(this.table.find('tr.form-row:even').hasClass('row1'));
- assert.ok(this.table.find('tr.form-row:odd').hasClass('row2'));
-});
-
-
QUnit.module('admin.inlines: tabular formsets with max_num', {
beforeEach: function() {
var $ = django.jQuery;
diff --git a/js_tests/tests.html b/js_tests/tests.html
index 988b7e3a4c..6878dd5cda 100644
--- a/js_tests/tests.html
+++ b/js_tests/tests.html
@@ -28,7 +28,7 @@
<input id="id_first-TOTAL_FORMS" value="1">
<input id="id_first-MAX_NUM_FORMS" value="">
<table class="inline">
- <tr id="first-0" class="form-row row1">
+ <tr id="first-0" class="form-row">
<td class="field-test_field">
<input id="id_first-0-test_field">
</td>
@@ -47,7 +47,7 @@
<input id="id_second-MAX_NUM_FORMS" value="">
<input id="id_second-MIN_NUM_FORMS" value="">
<table class="inline">
- <tr id="second-0" class="form-row has_original row1">
+ <tr id="second-0" class="form-row has_original">
<td class="field-test_field">
<input id="id_second-0-test_field">
</td>
@@ -62,7 +62,7 @@
</ul>
</td>
</tr>
- <tr id="second-1" class="form-row row2">
+ <tr id="second-1" class="form-row">
<td class="field-test_field">
<input id="id_second-1-test_field">
</td>