From 181f4e78b95522d07917c7a46869d502f451d159 Mon Sep 17 00:00:00 2001 From: Matt Zabriskie Date: Mon, 27 Jun 2016 12:48:09 -0600 Subject: [PATCH] Attempting to fix SauceLabs timeouts --- karma.conf.js | 11 +++++++---- test/specs/__helpers.js | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 8f2fe0a..a28e84d 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -53,9 +53,10 @@ module.exports = function(config) { // Safari if (runAll || process.env.SAUCE_SAFARI) { - // TODO: Fix the issue with disconnected tests // customLaunchers.SL_Safari7 = createCustomLauncher('safari', 7); // customLaunchers.SL_Safari8 = createCustomLauncher('safari', 8); + + // TODO: Fix the issue with disconnected tests // customLaunchers.SL_Safari9 = createCustomLauncher('safari', 9); } @@ -70,15 +71,17 @@ module.exports = function(config) { if (runAll || process.env.SAUCE_IE) { // TODO These need to be fixed // customLaunchers.SL_IE8 = createCustomLauncher('internet explorer', 8, 'Windows 7'); - customLaunchers.SL_IE9 = createCustomLauncher('internet explorer', 9, 'Windows 2008'); + + // TODO: Fix the issue with disconnected tests + // customLaunchers.SL_IE9 = createCustomLauncher('internet explorer', 9, 'Windows 2008'); + customLaunchers.SL_IE10 = createCustomLauncher('internet explorer', 10, 'Windows 2012'); customLaunchers.SL_IE11 = createCustomLauncher('internet explorer', 11, 'Windows 8.1'); } // Edge if (runAll || process.env.SAUCE_EDGE) { - // TODO: Fix the issue with disconnected tests - // customLaunchers.SL_Edge = createCustomLauncher('microsoftedge', null, 'Windows 10'); + customLaunchers.SL_Edge = createCustomLauncher('microsoftedge', null, 'Windows 10'); } // IOS diff --git a/test/specs/__helpers.js b/test/specs/__helpers.js index 8a06d0d..f14734f 100644 --- a/test/specs/__helpers.js +++ b/test/specs/__helpers.js @@ -7,6 +7,10 @@ URLSearchParams = require('url-search-params'); // Import axios axios = require('../../index'); +// Jasmine config +jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000; +jasmine.getEnv().defaultTimeoutInterval = 20000; + // Is this an old version of IE that lacks standard objects like DataView, ArrayBuffer, FormData, etc. isOldIE = /MSIE (8|9)\.0/.test(navigator.userAgent);