From d68c49e66da68c47470967fe4a37e16e68f9e374 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 19 May 2019 21:27:34 -0400
Subject: [PATCH] Async tests running on dodgy Travis containers are not my
 friends (closes #6391)

Default timeout of 2000 regularly exceeded, causing spurious test failures.
Even a random garbage collection pause can take more than 2 seconds.
---
 test/spec/services/mapillary.js | 2 --
 test/spec/spec_helpers.js       | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/spec/services/mapillary.js b/test/spec/services/mapillary.js
index c74705e19..03d741d83 100644
--- a/test/spec/services/mapillary.js
+++ b/test/spec/services/mapillary.js
@@ -100,7 +100,6 @@ describe('iD.serviceMapillary', function() {
         });
 
         it('loads multiple pages of image results', function(done) {
-            this.timeout(10000);
             var calls = 0;
             mapillary.on('loadedImages', function() {
                 server.respond();  // respond to new fetches
@@ -194,7 +193,6 @@ describe('iD.serviceMapillary', function() {
         });
 
         it('loads multiple pages of signs results', function(done) {
-            this.timeout(10000);
             var calls = 0;
             mapillary.on('loadedSigns', function() {
                 server.respond();  // respond to new fetches
diff --git a/test/spec/spec_helpers.js b/test/spec/spec_helpers.js
index 830c59a2e..97ea9375d 100644
--- a/test/spec/spec_helpers.js
+++ b/test/spec/spec_helpers.js
@@ -22,6 +22,7 @@ iD.data.presets = {
 
 
 mocha.setup({
+    timeout: 10000,
     ui: 'bdd',
     globals: [
         '__onresize.tail-size',