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

services/web/app/coffee/Features/Subscription/SubscriptionGroupController.coffee

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

services/web/test/UnitTests/coffee/Subscription/SubscriptionGroupControllerTests.coffee

@@ -96,7 +96,16 @@ describe "SubscriptionGroupController", ->
 
 			res =
 				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()
 			@Controller.renderSubscriptionGroupAdminPage @req, res