| Index: third_party/polymer/components/iron-collapse/test/basic.html
|
| diff --git a/third_party/polymer/components/iron-collapse/test/basic.html b/third_party/polymer/components/iron-collapse/test/basic.html
|
| index e52459a3af01221cc5beb0c3037cf688dd9a3994..f7553c9f31a7af57cfa54d8d70851070bf5ba78d 100644
|
| --- a/third_party/polymer/components/iron-collapse/test/basic.html
|
| +++ b/third_party/polymer/components/iron-collapse/test/basic.html
|
| @@ -61,7 +61,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
| });
|
|
|
| test('default opened height', function() {
|
| - assert.equal(collapse.style.height, 'auto');
|
| + assert.equal(collapse.style.maxHeight, '');
|
| });
|
|
|
| test('set opened to false triggers animation', function(done) {
|
| @@ -81,7 +81,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
| // trying to animate the size update
|
| collapse.updateSize('0px', true);
|
| // Animation immediately disabled.
|
| - assert.equal(collapse.style.height, '0px');
|
| + assert.equal(collapse.style.maxHeight, '0px');
|
| });
|
|
|
| test('set opened to false, then to true', function(done) {
|
| @@ -89,21 +89,21 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
| collapse.addEventListener('transitionend', function() {
|
| if (collapse.opened) {
|
| // Check finalSize after animation is done.
|
| - assert.equal(collapse.style.height, 'auto');
|
| + assert.equal(collapse.style.height, '');
|
| done();
|
| } else {
|
| // Check if size is still 0px.
|
| - assert.equal(collapse.style.height, '0px');
|
| + assert.equal(collapse.style.maxHeight, '0px');
|
| // Trigger 2nd toggle.
|
| collapse.opened = true;
|
| // Size should be immediately set.
|
| - assert.equal(collapse.style.height, collapseHeight);
|
| + assert.equal(collapse.style.maxHeight, collapseHeight);
|
| }
|
| });
|
| // Trigger 1st toggle.
|
| collapse.opened = false;
|
| // Size should be immediately set.
|
| - assert.equal(collapse.style.height, '0px');
|
| + assert.equal(collapse.style.maxHeight, '0px');
|
| });
|
|
|
| test('opened changes trigger iron-resize', function() {
|
| @@ -130,13 +130,13 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
| test('toggle horizontal updates size', function() {
|
| collapse.horizontal = false;
|
| assert.equal(collapse.style.width, '');
|
| - assert.equal(collapse.style.height, 'auto');
|
| - assert.equal(collapse.style.transitionProperty, 'height');
|
| + assert.equal(collapse.style.maxHeight, '');
|
| + assert.equal(collapse.style.transitionProperty, 'max-height');
|
|
|
| collapse.horizontal = true;
|
| - assert.equal(collapse.style.width, 'auto');
|
| + assert.equal(collapse.style.maxWidth, '');
|
| assert.equal(collapse.style.height, '');
|
| - assert.equal(collapse.style.transitionProperty, 'width');
|
| + assert.equal(collapse.style.transitionProperty, 'max-width');
|
| });
|
|
|
| });
|
|
|