From d829d155284b1bb5b8f8bf438c904358f8688318 Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Mon, 20 Jun 2016 15:00:29 -0700
Subject: [PATCH] Fix(ish) race conditions in server tests

---
 spec/helpers/helper.js                  | 2 +-
 spec/server/functional/clan.spec.coffee | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/helpers/helper.js b/spec/helpers/helper.js
index 095663f95..f133f469c 100644
--- a/spec/helpers/helper.js
+++ b/spec/helpers/helper.js
@@ -36,7 +36,7 @@ if (database.generateMongoConnectionString() !== dbString) {
   throw Error('Stopping server tests because db connection string was not as expected.');
 }
 
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 10; // for long Stripe tests
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 15; // for long Stripe tests
 require('../server/common'); // Make sure global testing functions are set up
 
 // Ignore Stripe/Nocking erroring
diff --git a/spec/server/functional/clan.spec.coffee b/spec/server/functional/clan.spec.coffee
index 5a1f06c11..c72aca016 100644
--- a/spec/server/functional/clan.spec.coffee
+++ b/spec/server/functional/clan.spec.coffee
@@ -403,10 +403,10 @@ describe 'Clans', ->
             loginNewUser (user2) ->
               user2.set 'stripe.free', true
               user2.save (err) ->
-              request.put {uri: "#{clanURL}/#{clan.id}/join" }, (err, res, body) ->
-                expect(err).toBeNull()
-                expect(res.statusCode).toBe(200)
-                done()
+                request.put {uri: "#{clanURL}/#{clan.id}/join" }, (err, res, body) ->
+                  expect(err).toBeNull()
+                  expect(res.statusCode).toBe(200)
+                  done()
 
     it 'Join clan when not premium 403', (done) ->
       loginNewUser (user1) ->