From: Daniel Ruf <daniel.ruf@ueberbit.de>
Date: Sat, 16 Jun 2018 08:08:12 +0000 (+0200)
Subject: Use pull request #11179 from DanielRuf/tests/increase-timeouts-viewport-reflow-test... 
X-Git-Tag: v6.5.0-rc.1^2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c10ad0927bf86b37e975b3260959cc19a93ec0a1;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Use pull request #11179 from DanielRuf/tests/increase-timeouts-viewport-reflow-test for v6.5.0

1eb8b1fdf tests: prevent race condition in _reflow test

Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>
---

diff --git a/test/javascript/components/interchange.js b/test/javascript/components/interchange.js
index f38a57e02..6734b3576 100755
--- a/test/javascript/components/interchange.js
+++ b/test/javascript/components/interchange.js
@@ -170,12 +170,10 @@ describe('Interchange', function() {
     it('calls reflow on viewport size change once', function(done) {
       $html = $(generateTemplate('image')).appendTo('body');
       plugin = new Foundation.Interchange($html, {});
-      Foundation.IHearYou();
-      let spy = sinon.spy(plugin, '_reflow');
-
       setTimeout(function() {
-        $(window).trigger('resize');
+        Foundation.IHearYou();
       }, 1);
+      let spy = sinon.spy(plugin, '_reflow');
 
       setTimeout(function() {
         $(window).trigger('resize');
@@ -185,6 +183,10 @@ describe('Interchange', function() {
         $(window).trigger('resize');
       }, 10);
 
+      setTimeout(function() {
+        $(window).trigger('resize');
+      }, 20);
+
       setTimeout(function() { // Wait for third trigger...
         sinon.assert.calledOnce(spy);
         done();