@@ -62,7 +62,7 @@ index e008887fa..d10ebdf1d 100644
62
62
transports: ['polling'],
63
63
64
64
diff --git a/package.json b/package.json
65
- index c2410e7b0..0100228d7 100644
65
+ index 556640c17..8a16b20fd 100644
66
66
--- a/package.json
67
67
+++ b/package.json
68
68
@@ -33,7 +33,6 @@
@@ -74,7 +74,7 @@ index c2410e7b0..0100228d7 100644
74
74
"bower": "bower",
75
75
"dev": "webpack --watch & npm run nodemon",
76
76
diff --git a/spec/helpers/helper.js b/spec/helpers/helper.js
77
- index fb5e78004..a94be4631 100644
77
+ index fb5e78004..194abd6d9 100644
78
78
--- a/spec/helpers/helper.js
79
79
+++ b/spec/helpers/helper.js
80
80
@@ -2,6 +2,8 @@ var _ = require('lodash');
@@ -86,6 +86,15 @@ index fb5e78004..a94be4631 100644
86
86
87
87
var oldIt = global.it;
88
88
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
89
98
diff --git a/webpack.base.config.js b/webpack.base.config.js
90
99
index 2e3017c7d..759aae42b 100644
91
100
--- a/webpack.base.config.js
0 commit comments