Merge branch 'develop' into new_api_test_infrastructure

2015-10-20 21:18:49 -05:00
parent a0e7eef956 d4146d69e2
commit 3036c6db9e
65 changed files with 3485 additions and 3125 deletions
@@ -155,7 +155,7 @@ describe 'In-App Purchases', ->
        inApp.iosVerify(req, res, next)

        expect(paymentSpy).to.be.calledOnce
-        expect(paymentSpy).to.be.calledWith({user: res.locals.user, paymentMethod:'IAP AppleStore'})
+        expect(paymentSpy).to.be.calledWith({user: res.locals.user, paymentMethod:'IAP AppleStore', amount: 5.25})

    context 'error in setup', ->
      before ->