Skip to content

Commit 445799d

Browse files
committed
added test for remove
1 parent 878ff96 commit 445799d

File tree

2 files changed

+43
-6
lines changed

2 files changed

+43
-6
lines changed

test/page/test.html

+21-4
Original file line numberDiff line numberDiff line change
@@ -397,20 +397,37 @@ <h3>min-height</h3>
397397

398398
<div class="items-container inline-style-items">
399399
<div class="item item-0" style="display: inline-block">
400-
<h2>min-height</h2>
400+
<h2>inline style</h2>
401401
<p>Phasellus ut nibh fermentum, vulputate urna vel, semper diam.</p>
402402
<p>Aenean semper felis ipsum, vulputate consequat dui elementum vel.</p>
403403
</div>
404404
<div class="item item-1" style="position: relative">
405-
<h3>min-height</h3>
405+
<h3>inline style</h3>
406406
<p>Phasellus ut nibh fermentum, vulputate urna vel, semper diam. Nunc sollicitudin felis ut pellentesque fermentum. In erat mi, pulvinar sit amet tincidunt vitae, gravida id felis. Phasellus hendrerit erat sed porta imperdiet. Vivamus viverra ipsum tortor, et congue mauris porttitor ut.</p>
407407
</div>
408408
<div class="item item-2" style="min-height: 10px">
409-
<h4>min-height</h4>
409+
<h4>inline style</h4>
410410
<p>Aenean semper felis ipsum, vulputate consequat dui elementum vel. Nullam odio eros, sagittis vitae lectus id, pretium viverra lectus. Etiam auctor dolor non dui ultricies pulvinar.</p>
411411
</div>
412412
<div class="item item-3" style="padding: 15px">
413-
<h3>min-height</h3>
413+
<h3>inline style</h3>
414+
<p>Aenean semper.</p>
415+
</div>
416+
</div>
417+
418+
<div class="items-container remove-items">
419+
<div class="item item-0">
420+
<h2>removed</h2>
421+
<p>Phasellus ut nibh fermentum, vulputate urna vel, semper diam.</p>
422+
<p>Aenean semper felis ipsum, vulputate consequat dui elementum vel.</p>
423+
</div>
424+
<div class="item item-1">
425+
<p>Phasellus ut nibh fermentum, vulputate urna vel, semper diam. Nunc sollicitudin felis ut pellentesque fermentum. In erat mi, pulvinar sit amet tincidunt vitae, gravida id felis. Phasellus hendrerit erat sed porta imperdiet. Vivamus viverra ipsum tortor, et congue mauris porttitor ut.</p>
426+
</div>
427+
<div class="item item-2">
428+
<p>Aenean semper felis ipsum, vulputate consequat dui elementum vel. Nullam odio eros, sagittis vitae lectus id, pretium viverra lectus. Etiam auctor dolor non dui ultricies pulvinar.</p>
429+
</div>
430+
<div class="item item-3">
414431
<p>Aenean semper.</p>
415432
</div>
416433
</div>

test/specs/matchHeight.spec.js

+22-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ describe('matchHeight', function() {
107107
expect(1.0001).not.toBeWithinTolerance(0);
108108

109109
$('.simple-items, .image-items, .nested-items-parent, .nested-items,' +
110-
'.fixed-items, .inline-block-items, .inline-flex-items, .items-with-float, .inline-style-items')
110+
'.fixed-items, .inline-block-items, .inline-flex-items, .items-with-float, .inline-style-items, .remove-items')
111111
.each(function() {
112112
var $items = $(this).children('.item'),
113113
rows = $.fn.matchHeight._rows($items);
@@ -148,7 +148,7 @@ describe('matchHeight', function() {
148148
$.fn.matchHeight._update();
149149

150150
$('.simple-items, .image-items,' +
151-
'.fixed-items, .inline-block-items, .inline-flex-items, .items-with-float, .inline-style-items')
151+
'.fixed-items, .inline-block-items, .inline-flex-items, .items-with-float, .inline-style-items, .remove-items')
152152
.each(function() {
153153
var $items = $(this).children('.item'),
154154
targetHeight = $items.first().outerHeight(),
@@ -407,6 +407,26 @@ describe('matchHeight', function() {
407407

408408
done();
409409
});
410+
411+
it('can be removed', function(done) {
412+
var matchHeight = $.fn.matchHeight,
413+
$item = $('.remove-items').find('.item-0'),
414+
isInAnyGroup = false;
415+
416+
$item.matchHeight({ remove: true });
417+
expect($item[0].style.height).toBeFalsy();
418+
419+
for (var i = 0; i < matchHeight._groups.length; i += 1) {
420+
var group = matchHeight._groups[i];
421+
if ($.inArray($item[0], group.elements) !== -1) {
422+
isInAnyGroup = true;
423+
break;
424+
}
425+
}
426+
427+
expect(isInAnyGroup).toBeFalsy();
428+
done();
429+
});
410430
});
411431

412432

0 commit comments

Comments
 (0)