github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:sharelatex/web-sharelatex

Browse source
This commit is contained in:
Shane Kilkelly 2017-06-27 08:24:24 +01:00
commit b73b78e570
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/app/coffee/Features/Subscription/SubscriptionGroupController.coffee
View file

@ -54,8 +54,8 @@ module.exports =
renderSubscriptionGroupAdminPage: (req, res)-> renderSubscriptionGroupAdminPage: (req, res)->
user_id = AuthenticationController.getLoggedInUserId(req) user_id = AuthenticationController.getLoggedInUserId(req)
SubscriptionLocator.getUsersSubscription user_id, (err, subscription)-> SubscriptionLocator.getUsersSubscription user_id, (err, subscription)->
if !subscription.groupPlan if !subscription?.groupPlan
return res.redirect("/") return res.redirect("/user/subscription")
SubscriptionGroupHandler.getPopulatedListOfMembers user_id, (err, users)-> SubscriptionGroupHandler.getPopulatedListOfMembers user_id, (err, users)->
res.render "subscriptions/group_admin", res.render "subscriptions/group_admin",
title: 'group_admin' title: 'group_admin'

11
services/web/test/UnitTests/coffee/Subscription/SubscriptionGroupControllerTests.coffee
View file

@ -96,7 +96,16 @@ describe "SubscriptionGroupController", ->
res = res =
redirect : (path)=> redirect : (path)=>
path.should.equal("/") path.should.equal("/user/subscription")
done()
@Controller.renderSubscriptionGroupAdminPage @req, res
it "should redirect you don't have a subscription", (done)->
@SubscriptionLocator.getUsersSubscription = sinon.stub().callsArgWith(1)
res =
redirect : (path)=>
path.should.equal("/user/subscription")
done() done()
@Controller.renderSubscriptionGroupAdminPage @req, res @Controller.renderSubscriptionGroupAdminPage @req, res