summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliabru <liabru@brm.io>2015-12-25 14:36:23 +0000
committerliabru <liabru@brm.io>2015-12-25 14:36:23 +0000
commit445799d32e72c0946e7694d81218285be3a818ec (patch)
tree6e9ae518a876ccfcbde266fbf12cf679ea84d095
parent878ff96b2c2a0ecaf195af79210d4ac34ec06cd8 (diff)
downloadjquery-match-height-445799d32e72c0946e7694d81218285be3a818ec.zip
jquery-match-height-445799d32e72c0946e7694d81218285be3a818ec.tar.gz
jquery-match-height-445799d32e72c0946e7694d81218285be3a818ec.tar.bz2
added test for remove
-rw-r--r--test/page/test.html25
-rw-r--r--test/specs/matchHeight.spec.js24
2 files changed, 43 insertions, 6 deletions
diff --git a/test/page/test.html b/test/page/test.html
index 29c936d..4c66cb6 100644
--- a/test/page/test.html
+++ b/test/page/test.html
@@ -397,20 +397,37 @@
<div class="items-container inline-style-items">
<div class="item item-0" style="display: inline-block">
- <h2>min-height</h2>
+ <h2>inline style</h2>
<p>Phasellus ut nibh fermentum, vulputate urna vel, semper diam.</p>
<p>Aenean semper felis ipsum, vulputate consequat dui elementum vel.</p>
</div>
<div class="item item-1" style="position: relative">
- <h3>min-height</h3>
+ <h3>inline style</h3>
<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>
</div>
<div class="item item-2" style="min-height: 10px">
- <h4>min-height</h4>
+ <h4>inline style</h4>
<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>
</div>
<div class="item item-3" style="padding: 15px">
- <h3>min-height</h3>
+ <h3>inline style</h3>
+ <p>Aenean semper.</p>
+ </div>
+ </div>
+
+ <div class="items-container remove-items">
+ <div class="item item-0">
+ <h2>removed</h2>
+ <p>Phasellus ut nibh fermentum, vulputate urna vel, semper diam.</p>
+ <p>Aenean semper felis ipsum, vulputate consequat dui elementum vel.</p>
+ </div>
+ <div class="item item-1">
+ <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>
+ </div>
+ <div class="item item-2">
+ <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>
+ </div>
+ <div class="item item-3">
<p>Aenean semper.</p>
</div>
</div>
diff --git a/test/specs/matchHeight.spec.js b/test/specs/matchHeight.spec.js
index 0d0e4cb..627b3ff 100644
--- a/test/specs/matchHeight.spec.js
+++ b/test/specs/matchHeight.spec.js
@@ -107,7 +107,7 @@ describe('matchHeight', function() {
expect(1.0001).not.toBeWithinTolerance(0);
$('.simple-items, .image-items, .nested-items-parent, .nested-items,' +
- '.fixed-items, .inline-block-items, .inline-flex-items, .items-with-float, .inline-style-items')
+ '.fixed-items, .inline-block-items, .inline-flex-items, .items-with-float, .inline-style-items, .remove-items')
.each(function() {
var $items = $(this).children('.item'),
rows = $.fn.matchHeight._rows($items);
@@ -148,7 +148,7 @@ describe('matchHeight', function() {
$.fn.matchHeight._update();
$('.simple-items, .image-items,' +
- '.fixed-items, .inline-block-items, .inline-flex-items, .items-with-float, .inline-style-items')
+ '.fixed-items, .inline-block-items, .inline-flex-items, .items-with-float, .inline-style-items, .remove-items')
.each(function() {
var $items = $(this).children('.item'),
targetHeight = $items.first().outerHeight(),
@@ -407,6 +407,26 @@ describe('matchHeight', function() {
done();
});
+
+ it('can be removed', function(done) {
+ var matchHeight = $.fn.matchHeight,
+ $item = $('.remove-items').find('.item-0'),
+ isInAnyGroup = false;
+
+ $item.matchHeight({ remove: true });
+ expect($item[0].style.height).toBeFalsy();
+
+ for (var i = 0; i < matchHeight._groups.length; i += 1) {
+ var group = matchHeight._groups[i];
+ if ($.inArray($item[0], group.elements) !== -1) {
+ isInAnyGroup = true;
+ break;
+ }
+ }
+
+ expect(isInAnyGroup).toBeFalsy();
+ done();
+ });
});