From 3eb7bdd79275312fb0ab997ff1d7bd3c1e7dd6b7 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Mon, 12 Jun 2017 19:52:33 +0200 Subject: [PATCH] build: duplicate update of jasmine timeout interval (#5085) --- test/karma-test-shim.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js index a451530c9c3..ba7c9509392 100644 --- a/test/karma-test-shim.js +++ b/test/karma-test-shim.js @@ -1,6 +1,10 @@ /*global jasmine, __karma__, window*/ Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 3000; + +// The default time that jasmine waits for an asynchronous test to finish is five seconds. +// If this timeout is too short the CI may fail randomly because our asynchronous tests can +// take longer in some situations (e.g Saucelabs and Browserstack tunnels) +jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; __karma__.loaded = function () {}; @@ -85,8 +89,6 @@ function configureTestBed() { var testing = providers[0]; var testingBrowser = providers[1]; - jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; - var testBed = testing.TestBed.initTestEnvironment( testingBrowser.BrowserDynamicTestingModule, testingBrowser.platformBrowserDynamicTesting()