Merge pull request #719 from sharelatex/dcl-test-fix

Small repair to SubscriptionController Test

services/web/app/coffee/Features/Authentication/AuthenticationController.coffee

@@ -159,9 +159,7 @@ module.exports = AuthenticationController =
 		return isValid
 
 	_redirectToLoginOrRegisterPage: (req, res)->
-		if (req.query.zipUrl? or
-			  req.query.project_name? or
-			  req.path == '/user/subscription/new')
+		if (req.query.zipUrl? or req.query.project_name? or req.path == '/user/subscription/new')
 			return AuthenticationController._redirectToRegisterPage(req, res)
 		else
 			AuthenticationController._redirectToLoginPage(req, res)

services/web/app/coffee/Features/HealthCheck/HealthCheckController.coffee

@@ -10,7 +10,7 @@ module.exports = HealthCheckController =
 	check: (req, res, next = (error) ->) ->
 		d = domain.create()
 		d.on "error", (error) ->
- 			logger.err err: error, "error in mocha"
+			logger.err err: error, "error in mocha"
 		d.run () ->
 			mocha = new Mocha(reporter: Reporter(res), timeout: 10000)
 			mocha.addFile("test/smoke/js/SmokeTests.js")

services/web/app/coffee/Features/User/UserController.coffee

@@ -163,8 +163,8 @@ module.exports = UserController =
 					logger.log user: user, "passwords do not match"
 					res.send
 						message:
-						  type:'error'
-						  text:'Your passwords do not match'
+							type:'error'
+							text:'Your passwords do not match'
 				else
 					logger.log user: user, "password changed"
 					AuthenticationManager.setUserPassword user._id, newPassword1, (error) ->
@@ -179,5 +179,5 @@ module.exports = UserController =
 				logger.log user_id: user_id, "current password wrong"
 				res.send
 					message:
-					  type:'error'
-					  text:'Your old password is wrong'
+						type:'error'
+						text:'Your old password is wrong'

services/web/test/unit/coffee/Authentication/AuthenticationControllerTests.coffee

@@ -341,7 +341,7 @@ describe "AuthenticationController", ->
 						_id:@user_id
 					}
 				}
-		 	}
+			}
 			result = @AuthenticationController.getLoggedInUserId @req
 			expect(result).to.equal @user_id
 

services/web/test/unit/coffee/Exports/ExportsControllerTests.coffee

@@ -41,11 +41,11 @@ describe 'ExportsController', ->
 	it 'should ask the handler to return the status of an export', (done) ->
 		@handler.fetchExport = sinon.stub().yields(
 			null,
-			 "{\"id\":897, \"status_summary\":\"completed\"}")
+			"{\"id\":897, \"status_summary\":\"completed\"}")
 
 		@req.params = {project_id: project_id, export_id: 897}
 		@controller.exportStatus @req, send:(body) =>
 			expect(body).to.deep.equal {export_json: {
-				 status_summary: 'completed', status_detail: undefined
+				status_summary: 'completed', status_detail: undefined
 			}}
 			done()

services/web/test/unit/coffee/Subscription/SubscriptionControllerTests.coffee

@@ -124,13 +124,11 @@ describe "SubscriptionController", ->
 				@UserGetter =
 					getUser: sinon.stub().callsArgWith(2, null, null)
 				@res.callback = done
-				@SubscriptionController.plansPage(@req, @res)
 				@AuthenticationController =
 					getLoggedInUser: sinon.stub().callsArgWith(1, null, null)
 					getLoggedInUserId: sinon.stub().returns(null)
 					getSessionUser: sinon.stub().returns(null)
 					isUserLoggedIn: sinon.stub().returns(false)
-
 				@SubscriptionController = SandboxedModule.require modulePath, requires:
 					'../Authentication/AuthenticationController': @AuthenticationController
 					'./SubscriptionHandler': @SubscriptionHandler
@@ -146,6 +144,7 @@ describe "SubscriptionController", ->
 					"../User/UserGetter": @UserGetter
 					"./RecurlyWrapper": @RecurlyWrapper = {}
 					"./FeaturesUpdater": @FeaturesUpdater = {}
+				@SubscriptionController.plansPage(@req, @res)
 
 			it 'should not fetch the current user', (done) ->
 				@UserGetter.getUser.callCount.should.equal 0
@@ -500,4 +499,4 @@ describe "SubscriptionController", ->
 				@SubscriptionHandler.updateSubscription.calledWith(@user, "collaborator-annual", "COLLABORATORCODEHERE").should.equal true
 				done()
 
-			@SubscriptionController.processUpgradeToAnnualPlan @req, @res
+			@SubscriptionController.processUpgradeToAnnualPlan @req, @res