From eb77e80de01e658541d4fcc3b0b38783ce4e6a7e Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sat, 7 Mar 2020 09:35:59 -0800 Subject: Fixed #31349 -- Used :nth-child() CSS pseudo-class to style alternative rows in admin. --- js_tests/admin/inlines.test.js | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'js_tests/admin/inlines.test.js') 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; -- cgit v1.3