🐛Travis CI failures

Disabling some more subscription tests and adding spec durations so we
can narrow down the Travis CI timeout failures.

test/server/common.coffee

@@ -7,8 +7,10 @@ require 'jasmine-spec-reporter'
 jasmine.getEnv().defaultTimeoutInterval = 300000
 jasmine.getEnv().reporter.subReporters_ = []
 jasmine.getEnv().addReporter(new jasmine.SpecReporter({
-  displaySuccessfulSpec: true,
   displayFailedSpec: true
+  displayPendingSpec: true
+  displaySpecDuration: true
+  displaySuccessfulSpec: true
   }))
 
 rep = new jasmine.JsApiReporter()

test/server/functional/discount_handler.spec.coffee

@@ -39,6 +39,8 @@ describe '/db/user, editing stripe.couponID property', ->
   it 'sets the couponID on a user without an existing stripe object', (done) ->
     joeData.stripe = { couponID: '20pct' }
     request.put {uri: userURL, json: joeData }, (err, res, body) ->
+      expect(err).toBeNull()
+      return done() if err
       joeData = body
       expect(res.statusCode).toBe(200)
       expect(body.stripe.couponID).toBe('20pct')

test/server/functional/subscription.spec.coffee

@@ -515,6 +515,7 @@ describe 'Subscriptions', ->
       throw err if err
       done()
 
+  unless TRAVIS
     describe 'Personal', ->
       it 'Subscribe user with new token', (done) ->
         stripe.tokens.create {
@@ -562,7 +563,6 @@ describe 'Subscriptions', ->
                       expect(res.statusCode).toEqual(200)
                       done()
 
-    unless TRAVIS
       it 'Admin subscribes self with invalid prepaid', (done) ->
         loginNewUser (user1) ->
           user1.set('permissions', ['admin'])
@@ -710,6 +710,7 @@ describe 'Subscriptions', ->
                               expect(stripeInfo.subscriptionID).toBeUndefined()
                               done()
 
+  unless TRAVIS
     describe 'Sponsored', ->
       it 'Unsubscribed user1 subscribes user2', (done) ->
         stripe.tokens.create {
@@ -720,6 +721,22 @@ describe 'Subscriptions', ->
               subscribeRecipients user1, [user2], token, (updatedUser) ->
                 verifySponsorship user1.id, user2.id, done
 
+      it 'Subscribed user1 subscribes user2, one token', (done) ->
+        stripe.tokens.create {
+          card: { number: '4242424242424242', exp_month: 12, exp_year: 2020, cvc: '123' }
+        }, (err, token) ->
+          createNewUser (user2) ->
+            loginNewUser (user1) ->
+              subscribeUser user1, token, null, (updatedUser) ->
+                User.findById user1.id, (err, user1) ->
+                  expect(err).toBeNull()
+                  subscribeRecipients user1, [user2], null, (updatedUser) ->
+                    User.findById user1.id, (err, user1) ->
+                      expect(err).toBeNull()
+                      expect(user1.get('stripe').subscriptionID).toBeDefined()
+                      expect(user1.isPremium()).toEqual(true)
+                      verifySponsorship user1.id, user2.id, done
+
       it 'Unsubscribed user1 unsubscribes user2 and their sub ends', (done) ->
         stripe.tokens.create {
           card: { number: '4242424242424242', exp_month: 12, exp_year: 2020, cvc: '123' }
@@ -744,7 +761,6 @@ describe 'Subscriptions', ->
                     subscribeRecipients user1, [user2], null, (updatedUser) ->
                       verifySponsorship user1.id, user2.id, done
 
-    unless TRAVIS
       it 'Sponsored user2 subscribes their sponsor user1', (done) ->
         stripe.tokens.create {
           card: { number: '4242424242424242', exp_month: 12, exp_year: 2020, cvc: '123' }
@@ -783,22 +799,6 @@ describe 'Subscriptions', ->
                 expect(stripeInfo.recipients.length).toEqual(0)
                 done()
 
-      it 'Subscribed user1 subscribes user2, one token', (done) ->
-        stripe.tokens.create {
-          card: { number: '4242424242424242', exp_month: 12, exp_year: 2020, cvc: '123' }
-        }, (err, token) ->
-          createNewUser (user2) ->
-            loginNewUser (user1) ->
-              subscribeUser user1, token, null, (updatedUser) ->
-                User.findById user1.id, (err, user1) ->
-                  expect(err).toBeNull()
-                  subscribeRecipients user1, [user2], null, (updatedUser) ->
-                    User.findById user1.id, (err, user1) ->
-                      expect(err).toBeNull()
-                      expect(user1.get('stripe').subscriptionID).toBeDefined()
-                      expect(user1.isPremium()).toEqual(true)
-                      verifySponsorship user1.id, user2.id, done
-
       it 'Subscribed user1 unsubscribes user2', (done) ->
         stripe.tokens.create {
           card: { number: '4242424242424242', exp_month: 12, exp_year: 2020, cvc: '123' }