Merge branch 'test-timeouts'

Author: bicknellr

iron-swipeable-container.html

@@ -85,7 +85,7 @@
       /**
        * If true, then the container will not allow swiping.
        */
-      disabled: {type: Boolean, value: false},
+      disabled: {type: Boolean, value: false, observer: '__NOOP_IE11'},
 
       /**
        * The ratio of the width of the element that the translation animation
@@ -109,6 +109,10 @@
       transition: {type: String, value: '300ms cubic-bezier(0.4, 0.0, 1, 1)'}
     },
 
+    // This observer is only here because it prevents a bug that occurs in IE11
+    // where attributes used to set boolean properties do not otherwise apply.
+    __NOOP_IE11: function() {},
+
     ready: function() {
       this._transitionProperty = 'opacity, transform';
       this._swipeComplete = false;

test/basic.html

@@ -71,6 +71,12 @@
   </test-fixture>
 
   <script>
+    (function() {
+    // The maximum number of milliseconds after completing a track action that
+    // may occur before the 'iron-swipe' event is dispatched, if any would be.
+    // This value should be longer than the swipe transition.
+    const SWIPE_TIMEOUT = 500;
+
     suite('native elements', function() {
       test('dragging less than halfway does not swipe', function(done) {
         var container = fixture('basic');
@@ -89,8 +95,8 @@
             expect(Polymer.dom(container).queryDistributedElements('*').length)
                 .to.be.equal(2);
             done();
-          }, 1);
-        });
+          }, SWIPE_TIMEOUT);
+        }, 1);
       });
 
       test('dragging more than halfway swipes it', function(done) {
@@ -108,7 +114,7 @@
           });
 
           MockInteractions.track(element, 60, 0);
-        });
+        }, 1);
       });
 
       test('an element with disable-swipe cannot be swiped', function(done) {
@@ -129,8 +135,8 @@
             expect(Polymer.dom(container).queryDistributedElements('*').length)
                 .to.be.equal(2);
             done();
-          }, 1);
-        });
+          }, SWIPE_TIMEOUT);
+        }, 1);
       });
     });
 
@@ -152,8 +158,8 @@
             expect(Polymer.dom(container).queryDistributedElements('*').length)
                 .to.be.equal(2);
             done();
-          }, 1);
-        });
+          }, SWIPE_TIMEOUT);
+        }, 1);
       });
 
       test('dragging more than halfway swipes it', function(done) {
@@ -171,7 +177,7 @@
           });
 
           MockInteractions.track(element, 60, 0);
-        });
+        }, 1);
       });
 
       test('an element with disable-swipe cannot be swiped', function(done) {
@@ -192,8 +198,8 @@
             expect(Polymer.dom(container).queryDistributedElements('*').length)
                 .to.be.equal(2);
             done();
-          }, 1);
-        });
+          }, SWIPE_TIMEOUT);
+        }, 1);
       });
     });
 
@@ -217,8 +223,8 @@
                 expect(Polymer.dom(container).queryDistributedElements('*').length)
                     .to.be.equal(2);
                 done();
-              }, 1);
-            });
+              }, SWIPE_TIMEOUT);
+            }, 1);
           });
 
       test(
@@ -240,8 +246,8 @@
                 expect(Polymer.dom(container).queryDistributedElements('*').length)
                     .to.be.equal(2);
                 done();
-              }, 1);
-            });
+              }, SWIPE_TIMEOUT);
+            }, 1);
           });
     });
 
@@ -268,9 +274,10 @@
               });
 
               MockInteractions.track(element, 60, 0);
-            });
+            }, 1);
           });
     });
+    })();
   </script>
 </body>
 </html>