Skip to content

Commit edd1e84

Browse files
authored
Increase codecombat test timeout to 60s (#118)
There have been a bunch of flickering tests, so hopefully this should help.
1 parent 65f63f9 commit edd1e84

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

examples/codecombat/decaffeinate.patch

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ index e008887fa..d10ebdf1d 100644
6262
transports: ['polling'],
6363

6464
diff --git a/package.json b/package.json
65-
index c2410e7b0..0100228d7 100644
65+
index 556640c17..8a16b20fd 100644
6666
--- a/package.json
6767
+++ b/package.json
6868
@@ -33,7 +33,6 @@
@@ -74,7 +74,7 @@ index c2410e7b0..0100228d7 100644
7474
"bower": "bower",
7575
"dev": "webpack --watch & npm run nodemon",
7676
diff --git a/spec/helpers/helper.js b/spec/helpers/helper.js
77-
index fb5e78004..a94be4631 100644
77+
index fb5e78004..194abd6d9 100644
7878
--- a/spec/helpers/helper.js
7979
+++ b/spec/helpers/helper.js
8080
@@ -2,6 +2,8 @@ var _ = require('lodash');
@@ -86,6 +86,15 @@ index fb5e78004..a94be4631 100644
8686

8787
var oldIt = global.it;
8888
global.it = function(description, testFn) {
89+
@@ -44,7 +46,7 @@ if (database.generateMongoConnectionString() !== dbString) {
90+
throw Error('Stopping server tests because db connection string was not as expected.');
91+
}
92+
93+
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 15; // for long Stripe tests
94+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60; // for long Stripe tests
95+
require('../server/common'); // Make sure global testing functions are set up
96+
97+
// Ignore Stripe/Nocking erroring
8998
diff --git a/webpack.base.config.js b/webpack.base.config.js
9099
index 2e3017c7d..759aae42b 100644
91100
--- a/webpack.base.config.js

0 commit comments

Comments
 (0)