| Index: third_party/polymer/components/iron-collapse/test/flex.html
|
| diff --git a/third_party/polymer/components/iron-collapse/test/basic.html b/third_party/polymer/components/iron-collapse/test/flex.html
|
| similarity index 76%
|
| copy from third_party/polymer/components/iron-collapse/test/basic.html
|
| copy to third_party/polymer/components/iron-collapse/test/flex.html
|
| index e52459a3af01221cc5beb0c3037cf688dd9a3994..bbe25f127f753bb9d86e45bc9c6a731039b00f0c 100644
|
| --- a/third_party/polymer/components/iron-collapse/test/basic.html
|
| +++ b/third_party/polymer/components/iron-collapse/test/flex.html
|
| @@ -12,7 +12,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
| <html>
|
| <head>
|
|
|
| - <title>iron-collapse-basic</title>
|
| + <title>iron-collapse-flex</title>
|
| <meta charset="utf-8">
|
| <meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
|
| @@ -20,48 +20,44 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
| <script src="../../web-component-tester/browser.js"></script>
|
| <script src="../../test-fixture/test-fixture-mocha.js"></script>
|
|
|
| + <link rel="import" href="../../iron-flex-layout/iron-flex-layout-classes.html">
|
| <link rel="import" href="../../test-fixture/test-fixture.html">
|
| <link rel="import" href="../iron-collapse.html">
|
|
|
| + <style is="custom-style" include="iron-flex">
|
| + </style>
|
| +
|
| </head>
|
| <body>
|
|
|
| <test-fixture id="test">
|
| <template>
|
| - <iron-collapse id="collapse" opened>
|
| - <div style="height:100px;">
|
| - Lorem ipsum
|
| - </div>
|
| - </iron-collapse>
|
| + <div id="container" class="layout vertical" style="height: 200px">
|
| + <iron-collapse id="collapse" opened style="flex: 1 0 auto">
|
| + <div style="height:100px;">
|
| + Lorem ipsum
|
| + </div>
|
| + </iron-collapse>
|
| + </div>
|
| </template>
|
| </test-fixture>
|
|
|
| <script>
|
|
|
| - suite('basic', function() {
|
| + suite('flex', function() {
|
|
|
| + var container;
|
| var collapse;
|
| var collapseHeight;
|
|
|
| setup(function() {
|
| - collapse = fixture('test');
|
| + container = fixture('test');
|
| + collapse = container.querySelector('iron-collapse');
|
| collapseHeight = getComputedStyle(collapse).height;
|
| });
|
|
|
| - test('opened attribute', function() {
|
| - assert.equal(collapse.opened, true);
|
| - });
|
| -
|
| - test('animated by default', function() {
|
| - assert.isTrue(!collapse.noAnimation, '`noAnimation` is falsy');
|
| - });
|
| -
|
| - test('horizontal attribute', function() {
|
| - assert.equal(collapse.horizontal, false);
|
| - });
|
| -
|
| test('default opened height', function() {
|
| - assert.equal(collapse.style.height, 'auto');
|
| + assert.equal(collapse.style.height, '');
|
| });
|
|
|
| test('set opened to false triggers animation', function(done) {
|
| @@ -81,7 +77,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 +85,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.maxHeight, '');
|
| 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 +126,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');
|
| });
|
|
|
| });
|
|
|
Chromium Code Reviews
Issue 2113853002:
Run bower update (Closed)
Base URL: https://github.com/catapult-project/catapult@polymer10-migration