Merge pull request #2047 from overleaf/spd-eslint-mocha-arrows

Enforce consistent callback style in mocha tests

GitOrigin-RevId: a64c293dae6926ef5831abe97eaf2044942a5c85

services/web/.eslintrc

@@ -51,20 +51,33 @@
       }
     ],
 
-    // Add some mocha specific rules
-    "mocha/handle-done-callback": "error",
-    "mocha/no-exclusive-tests": "error",
-    "mocha/no-global-tests": "error",
-    "mocha/no-identical-title": "error",
-    "mocha/no-nested-tests": "error",
-    "mocha/no-pending-tests": "error",
-    "mocha/no-skipped-tests": "error",
-
-    // Add some chai specific rules
-    "chai-expect/missing-assertion": "error",
-    "chai-expect/terminating-properties": "error",
     // Swap the no-unused-expressions rule with a more chai-friendly one
     "no-unused-expressions": 0,
     "chai-friendly/no-unused-expressions": "error"
-  }
+  },
+  "overrides": [
+    {
+      "files": ["**/test/*/src/**/*.js"],
+      "rules": {
+        // mocha-specific rules
+        "mocha/handle-done-callback": "error",
+        "mocha/no-exclusive-tests": "error",
+        "mocha/no-global-tests": "error",
+        "mocha/no-identical-title": "error",
+        "mocha/no-nested-tests": "error",
+        "mocha/no-pending-tests": "error",
+        "mocha/no-skipped-tests": "error",
+        "mocha/no-mocha-arrows": "error",
+
+        // chai-specific rules
+        "chai-expect/missing-assertion": "error",
+        "chai-expect/terminating-properties": "error",
+
+        // prefer-arrow-callback applies to all callbacks, not just ones in mocha tests.
+        // we don't enforce this at the top-level - just in tests to manage `this` scope
+        // based on mocha's context mechanism
+        "mocha/prefer-arrow-callback": "error"
+      }
+    }
+  ]
 }

services/web/test/acceptance/src/ApiClsiTests.js

@@ -50,14 +50,14 @@ describe('ApiClsiTests', function() {
       return done()
     })
 
-    describe('valid request', () =>
+    describe('valid request', function() {
       it('returns success and a list of output files', function(done) {
         return authed_request.post(
           {
             uri: '/api/clsi/compile/abcd',
             json: this.compileSpec
           },
-          function(error, response, body) {
+          (error, response, body) => {
             if (error != null) {
               throw error
             }
@@ -82,16 +82,17 @@ describe('ApiClsiTests', function() {
             return done()
           }
         )
-      }))
+      })
+    })
 
-    describe('unauthorized', () =>
+    describe('unauthorized', function() {
       it('returns 401', function(done) {
         return request.post(
           {
             uri: '/api/clsi/compile/abcd',
             json: this.compileSpec
           },
-          function(error, response, body) {
+          (error, response, body) => {
             if (error != null) {
               throw error
             }
@@ -100,15 +101,16 @@ describe('ApiClsiTests', function() {
             return done()
           }
         )
-      }))
+      })
+    })
   })
 
   describe('get output', function() {
-    describe('valid file', () =>
-      it('returns the file', done =>
-        authed_request.get(
+    describe('valid file', function() {
+      it('returns the file', function(done) {
+        return authed_request.get(
           '/api/clsi/compile/abcd/build/1234/output/project.pdf',
-          function(error, response, body) {
+          (error, response, body) => {
             if (error != null) {
               throw error
             }
@@ -116,13 +118,15 @@ describe('ApiClsiTests', function() {
             expect(response.body).to.equal('mock-pdf')
             return done()
           }
-        )))
+        )
+      })
+    })
 
-    describe('invalid file', () =>
-      it('returns 404', done =>
-        authed_request.get(
+    describe('invalid file', function() {
+      it('returns 404', function(done) {
+        return authed_request.get(
           '/api/clsi/compile/abcd/build/1234/output/project.aux',
-          function(error, response, body) {
+          (error, response, body) => {
             if (error != null) {
               throw error
             }
@@ -130,13 +134,15 @@ describe('ApiClsiTests', function() {
             expect(response.body).to.not.equal('mock-pdf')
             return done()
           }
-        )))
+        )
+      })
+    })
 
-    describe('unauthorized', () =>
-      it('returns 401', done =>
-        request.get(
+    describe('unauthorized', function() {
+      it('returns 401', function(done) {
+        return request.get(
           '/api/clsi/compile/abcd/build/1234/output/project.pdf',
-          function(error, response, body) {
+          (error, response, body) => {
             if (error != null) {
               throw error
             }
@@ -144,6 +150,8 @@ describe('ApiClsiTests', function() {
             expect(response.body).to.not.equal('mock-pdf')
             return done()
           }
-        )))
+        )
+      })
+    })
   })
 })

services/web/test/acceptance/src/AuthorizationTests.js

@@ -25,11 +25,7 @@ const try_read_access = (user, project_id, test, callback) =>
   async.series(
     [
       cb =>
-        user.request.get(`/project/${project_id}`, function(
-          error,
-          response,
-          body
-        ) {
+        user.request.get(`/project/${project_id}`, (error, response, body) => {
           if (error != null) {
             return cb(error)
           }
@@ -37,17 +33,16 @@ const try_read_access = (user, project_id, test, callback) =>
           return cb()
         }),
       cb =>
-        user.request.get(`/project/${project_id}/download/zip`, function(
-          error,
-          response,
-          body
-        ) {
-          if (error != null) {
-            return cb(error)
+        user.request.get(
+          `/project/${project_id}/download/zip`,
+          (error, response, body) => {
+            if (error != null) {
+              return cb(error)
+            }
+            test(response, body)
+            return cb()
           }
-          test(response, body)
-          return cb()
-        })
+        )
     ],
     callback
   )
@@ -63,7 +58,7 @@ const try_settings_write_access = (user, project_id, test, callback) =>
               compiler: 'latex'
             }
           },
-          function(error, response, body) {
+          (error, response, body) => {
             if (error != null) {
               return cb(error)
             }
@@ -86,7 +81,7 @@ const try_admin_access = (user, project_id, test, callback) =>
               newProjectName: 'new-name'
             }
           },
-          function(error, response, body) {
+          (error, response, body) => {
             if (error != null) {
               return cb(error)
             }
@@ -102,7 +97,7 @@ const try_admin_access = (user, project_id, test, callback) =>
               publicAccessLevel: 'private'
             }
           },
-          function(error, response, body) {
+          (error, response, body) => {
             if (error != null) {
               return cb(error)
             }
@@ -135,7 +130,7 @@ const try_content_access = function(user, project_id, test, callback) {
       json: true,
       jar: false
     },
-    function(error, response, body) {
+    (error, response, body) => {
       if (error != null) {
         return callback(error)
       }
@@ -204,7 +199,7 @@ const expect_no_read_access = (user, project_id, options, callback) =>
         try_read_access(
           user,
           project_id,
-          function(response, body) {
+          (response, body) => {
             expect(response.statusCode).to.equal(302)
             return expect(response.headers.location).to.match(
               new RegExp(options.redirect_to)
@@ -236,7 +231,7 @@ const expect_no_settings_write_access = (user, project_id, options, callback) =>
   try_settings_write_access(
     user,
     project_id,
-    function(response, body) {
+    (response, body) => {
       expect(response.statusCode).to.equal(302)
       return expect(response.headers.location).to.match(
         new RegExp(options.redirect_to)
@@ -249,7 +244,7 @@ const expect_no_admin_access = (user, project_id, options, callback) =>
   try_admin_access(
     user,
     project_id,
-    function(response, body) {
+    (response, body) => {
       expect(response.statusCode).to.equal(302)
       return expect(response.headers.location).to.match(
         new RegExp(options.redirect_to)

services/web/test/acceptance/src/CloseSiteTests.js

@@ -15,22 +15,29 @@ const chai = require('chai')
 const request = require('./helpers/request')
 
 describe('siteIsOpen', function() {
-  describe('when siteIsOpen is default (true)', () =>
-    it('should get page', done =>
-      request.get('/login', function(error, response, body) {
+  describe('when siteIsOpen is default (true)', function() {
+    it('should get page', function(done) {
+      return request.get('/login', (error, response, body) => {
         response.statusCode.should.equal(200)
         return done()
-      })))
+      })
+    })
+  })
 
   describe('when siteIsOpen is false', function() {
-    beforeEach(() => (Settings.siteIsOpen = false))
+    beforeEach(function() {
+      return (Settings.siteIsOpen = false)
+    })
 
-    afterEach(() => (Settings.siteIsOpen = true))
+    afterEach(function() {
+      return (Settings.siteIsOpen = true)
+    })
 
-    it('should return maintenance page', done =>
-      request.get('/login', function(error, response) {
+    it('should return maintenance page', function(done) {
+      return request.get('/login', (error, response) => {
         response.statusCode.should.equal(503)
         return done()
-      }))
+      })
+    })
   })
 })

services/web/test/acceptance/src/DeletionTests.js

@@ -10,8 +10,8 @@ const MockDocstoreApi = require('./helpers/MockDocstoreApi')
 require('./helpers/MockTagsApi')
 require('./helpers/MockV1Api')
 
-describe('Deleting a user', () => {
-  beforeEach(done => {
+describe('Deleting a user', function() {
+  beforeEach(function(done) {
     this.user = new User()
     async.series(
       [
@@ -23,7 +23,7 @@ describe('Deleting a user', () => {
     )
   })
 
-  it('Should remove the user from active users', done => {
+  it('Should remove the user from active users', function(done) {
     this.user.get((error, user) => {
       expect(error).not.to.exist
       expect(user).to.exist
@@ -38,7 +38,7 @@ describe('Deleting a user', () => {
     })
   })
 
-  it('Should create a soft-deleted user', done => {
+  it('Should create a soft-deleted user', function(done) {
     this.user.get((error, user) => {
       expect(error).not.to.exist
       this.user.deleteUser(error => {
@@ -70,7 +70,7 @@ describe('Deleting a user', () => {
     })
   })
 
-  it('Should fail if the user has a subscription', done => {
+  it('Should fail if the user has a subscription', function(done) {
     Subscription.create(
       {
         admin_id: this.user._id,
@@ -93,7 +93,7 @@ describe('Deleting a user', () => {
     )
   })
 
-  it("Should delete the user's projects", done => {
+  it("Should delete the user's projects", function(done) {
     this.user.createProject('wombat', (error, projectId) => {
       expect(error).not.to.exist
       this.user.getProject(projectId, (error, project) => {
@@ -112,8 +112,8 @@ describe('Deleting a user', () => {
     })
   })
 
-  describe('when scrubbing the user', () => {
-    beforeEach(done => {
+  describe('when scrubbing the user', function() {
+    beforeEach(function(done) {
       this.user.get((error, user) => {
         if (error) {
           throw error
@@ -123,7 +123,7 @@ describe('Deleting a user', () => {
       })
     })
 
-    it('Should remove the user data from mongo', done => {
+    it('Should remove the user data from mongo', function(done) {
       db.deletedUsers.findOne(
         { 'deleterData.deletedUserId': this.userId },
         (error, deletedUser) => {
@@ -163,8 +163,8 @@ describe('Deleting a user', () => {
   })
 })
 
-describe('Deleting a project', () => {
-  beforeEach(done => {
+describe('Deleting a project', function() {
+  beforeEach(function(done) {
     this.user = new User()
     this.projectName = 'wombat'
     this.user.ensureUserExists(() => {
@@ -177,7 +177,7 @@ describe('Deleting a project', () => {
     })
   })
 
-  it('Should remove the project from active projects', done => {
+  it('Should remove the project from active projects', function(done) {
     this.user.getProject(this.projectId, (error, project) => {
       expect(error).not.to.exist
       expect(project).to.exist
@@ -194,7 +194,7 @@ describe('Deleting a project', () => {
     })
   })
 
-  it('Should create a soft-deleted project', done => {
+  it('Should create a soft-deleted project', function(done) {
     this.user.getProject(this.projectId, (error, project) => {
       expect(error).not.to.exist
 
@@ -234,8 +234,8 @@ describe('Deleting a project', () => {
     })
   })
 
-  describe('When the project has docs', () => {
-    beforeEach(done => {
+  describe('When the project has docs', function() {
+    beforeEach(function(done) {
       this.user.getProject(this.projectId, (error, project) => {
         if (error) {
           throw error
@@ -255,7 +255,7 @@ describe('Deleting a project', () => {
       })
     })
 
-    it('should mark the docs as deleted', done => {
+    it('should mark the docs as deleted', function(done) {
       let doc =
         MockDocstoreApi.docs[this.projectId.toString()][this.docId.toString()]
       expect(doc).to.exist
@@ -270,8 +270,8 @@ describe('Deleting a project', () => {
       })
     })
 
-    describe('When the deleted project is expired', () => {
-      beforeEach(done => {
+    describe('When the deleted project is expired', function() {
+      beforeEach(function(done) {
         this.user.deleteProject(this.projectId, error => {
           if (error) {
             throw error
@@ -280,7 +280,7 @@ describe('Deleting a project', () => {
         })
       })
 
-      it('Should destroy the docs', done => {
+      it('Should destroy the docs', function(done) {
         expect(
           MockDocstoreApi.docs[this.projectId.toString()][this.docId.toString()]
         ).to.exist
@@ -304,7 +304,7 @@ describe('Deleting a project', () => {
         )
       })
 
-      it('Should remove the project data from mongo', done => {
+      it('Should remove the project data from mongo', function(done) {
         db.deletedProjects.findOne(
           { 'deleterData.deletedProjectId': ObjectId(this.projectId) },
           (error, deletedProject) => {

services/web/test/acceptance/src/FeatureUpdaterTests.js

@@ -30,11 +30,11 @@ const syncUserAndGetFeatures = function(user, callback) {
   if (callback == null) {
     callback = function(error, features) {}
   }
-  return FeaturesUpdater.refreshFeatures(user._id, function(error) {
+  return FeaturesUpdater.refreshFeatures(user._id, error => {
     if (error != null) {
       return callback(error)
     }
-    return User.findById(user._id, function(error, user) {
+    return User.findById(user._id, (error, user) => {
       if (error != null) {
         return callback(error)
       }
@@ -48,7 +48,7 @@ const syncUserAndGetFeatures = function(user, callback) {
 describe('FeatureUpdater.refreshFeatures', function() {
   beforeEach(function(done) {
     this.user = new UserClient()
-    return this.user.ensureUserExists(function(error) {
+    return this.user.ensureUserExists(error => {
       if (error != null) {
         throw error
       }
@@ -56,7 +56,7 @@ describe('FeatureUpdater.refreshFeatures', function() {
     })
   })
 
-  describe('when user has no subscriptions', () =>
+  describe('when user has no subscriptions', function() {
     it('should set their features to the basic set', function(done) {
       return syncUserAndGetFeatures(this.user, (error, features) => {
         if (error != null) {
@@ -65,7 +65,8 @@ describe('FeatureUpdater.refreshFeatures', function() {
         expect(features).to.deep.equal(settings.defaultFeatures)
         return done()
       })
-    }))
+    })
+  })
 
   describe('when the user has an individual subscription', function() {
     beforeEach(function() {

services/web/test/acceptance/src/Init.js

@@ -1,4 +1,6 @@
 const App = require('../../../app.js')
 require('logger-sharelatex').logger.level('error')
 
-before(done => App.listen(3000, 'localhost', done))
+before(function(done) {
+  return App.listen(3000, 'localhost', done)
+})

services/web/test/acceptance/src/LabelsTests.js

@@ -40,7 +40,9 @@ describe('Labels', function() {
     })
   })
 
-  afterEach(() => MockProjectHistoryApi.reset())
+  afterEach(function() {
+    return MockProjectHistoryApi.reset()
+  })
 
   it('getting labels', function(done) {
     const label_id = new ObjectId().toString()

services/web/test/acceptance/src/LinkedFilesTests.js

@@ -367,7 +367,7 @@ describe('LinkedFiles', function() {
             })
             return this.owner.request.get(
               `/project/${this.project_id}/file/${file._id}`,
-              function(error, response, body) {
+              (error, response, body) => {
                 if (error != null) {
                   throw error
                 }
@@ -429,7 +429,7 @@ describe('LinkedFiles', function() {
                   })
                   return this.owner.request.get(
                     `/project/${this.project_id}/file/${file._id}`,
-                    function(error, response, body) {
+                    (error, response, body) => {
                       if (error != null) {
                         throw error
                       }
@@ -556,7 +556,7 @@ describe('LinkedFiles', function() {
             })
             return this.owner.request.get(
               `/project/${this.project_id}/file/${file._id}`,
-              function(error, response, body) {
+              (error, response, body) => {
                 if (error != null) {
                   throw error
                 }

services/web/test/acceptance/src/ProjectCRUDTests.js

@@ -20,22 +20,24 @@ describe('Project CRUD', function() {
     return this.user.login(done)
   })
 
-  describe("when project doesn't exist", () =>
+  describe("when project doesn't exist", function() {
     it('should return 404', function(done) {
       return this.user.request.get(
         '/project/aaaaaaaaaaaaaaaaaaaaaaaa',
-        function(err, res, body) {
+        (err, res, body) => {
           expect(res.statusCode).to.equal(404)
           return done()
         }
       )
-    }))
+    })
+  })
 
-  describe('when project has malformed id', () =>
+  describe('when project has malformed id', function() {
     it('should return 404', function(done) {
-      return this.user.request.get('/project/blah', function(err, res, body) {
+      return this.user.request.get('/project/blah', (err, res, body) => {
         expect(res.statusCode).to.equal(404)
         return done()
       })
-    }))
+    })
+  })
 })

services/web/test/acceptance/src/ProjectFeaturesTests.js

@@ -63,17 +63,17 @@ describe('ProjectFeatures', function() {
       })
 
       it('should have premium features', function(done) {
-        return joinProject(this.owner._id, this.project_id, function(
-          error,
-          response,
-          body
-        ) {
-          expect(body.project.features.compileGroup).to.equal('priority')
-          expect(body.project.features.versioning).to.equal(true)
-          expect(body.project.features.templates).to.equal(true)
-          expect(body.project.features.dropbox).to.equal(true)
-          return done()
-        })
+        return joinProject(
+          this.owner._id,
+          this.project_id,
+          (error, response, body) => {
+            expect(body.project.features.compileGroup).to.equal('priority')
+            expect(body.project.features.versioning).to.equal(true)
+            expect(body.project.features.templates).to.equal(true)
+            expect(body.project.features.dropbox).to.equal(true)
+            return done()
+          }
+        )
       })
     })
 
@@ -86,17 +86,17 @@ describe('ProjectFeatures', function() {
       })
 
       it('should have basic features', function(done) {
-        return joinProject(this.owner._id, this.project_id, function(
-          error,
-          response,
-          body
-        ) {
-          expect(body.project.features.compileGroup).to.equal('standard')
-          expect(body.project.features.versioning).to.equal(false)
-          expect(body.project.features.templates).to.equal(false)
-          expect(body.project.features.dropbox).to.equal(false)
-          return done()
-        })
+        return joinProject(
+          this.owner._id,
+          this.project_id,
+          (error, response, body) => {
+            expect(body.project.features.compileGroup).to.equal('standard')
+            expect(body.project.features.versioning).to.equal(false)
+            expect(body.project.features.templates).to.equal(false)
+            expect(body.project.features.dropbox).to.equal(false)
+            return done()
+          }
+        )
       })
     })
   })

services/web/test/acceptance/src/ProjectInviteTests.js

@@ -293,8 +293,8 @@ const expectInvitesInJoinProjectCount = (user, projectId, count, callback) => {
   })
 }
 
-describe('ProjectInviteTests', () => {
-  beforeEach(done => {
+describe('ProjectInviteTests', function() {
+  beforeEach(function(done) {
     this.sendingUser = new User()
     this.user = new User()
     this.site_admin = new User({ email: 'admin@example.com' })
@@ -310,13 +310,13 @@ describe('ProjectInviteTests', () => {
     )
   })
 
-  describe('creating invites', () => {
-    beforeEach(() => {
+  describe('creating invites', function() {
+    beforeEach(function() {
       this.projectName = 'wat'
     })
 
-    describe('creating two invites', () => {
-      beforeEach(done => {
+    describe('creating two invites', function() {
+      beforeEach(function(done) {
         createProject(
           this.sendingUser,
           this.projectName,
@@ -329,7 +329,7 @@ describe('ProjectInviteTests', () => {
         )
       })
 
-      it('should allow the project owner to create and remove invites', done => {
+      it('should allow the project owner to create and remove invites', function(done) {
         Async.series(
           [
             cb => expectProjectAccess(this.sendingUser, this.projectId, cb),
@@ -408,7 +408,7 @@ describe('ProjectInviteTests', () => {
         )
       })
 
-      it('should allow the project owner to create many invites at once', done => {
+      it('should allow the project owner to create many invites at once', function(done) {
         Async.series(
           [
             cb => expectProjectAccess(this.sendingUser, this.projectId, cb),
@@ -482,8 +482,8 @@ describe('ProjectInviteTests', () => {
     })
   })
 
-  describe('clicking the invite link', () => {
-    beforeEach(done => {
+  describe('clicking the invite link', function() {
+    beforeEach(function(done) {
       createProjectAndInvite(
         this.sendingUser,
         this.projectName,
@@ -499,13 +499,13 @@ describe('ProjectInviteTests', () => {
       )
     })
 
-    describe('user is logged in already', () => {
-      beforeEach(done => {
+    describe('user is logged in already', function() {
+      beforeEach(function(done) {
         this.user.login(done)
       })
 
-      describe('user is already a member of the project', () => {
-        beforeEach(done => {
+      describe('user is already a member of the project', function() {
+        beforeEach(function(done) {
           Async.series(
             [
               cb => expectInvitePage(this.user, this.link, cb),
@@ -516,8 +516,8 @@ describe('ProjectInviteTests', () => {
           )
         })
 
-        describe('when user clicks on the invite a second time', () => {
-          it('should just redirect to the project page', done => {
+        describe('when user clicks on the invite a second time', function() {
+          it('should just redirect to the project page', function(done) {
             Async.series(
               [
                 cb => expectProjectAccess(this.user, this.invite.projectId, cb),
@@ -534,8 +534,8 @@ describe('ProjectInviteTests', () => {
             )
           })
 
-          describe('when the user recieves another invite to the same project', () =>
-            it('should redirect to the project page', done => {
+          describe('when the user recieves another invite to the same project', function() {
+            it('should redirect to the project page', function(done) {
               Async.series(
                 [
                   cb => {
@@ -575,12 +575,13 @@ describe('ProjectInviteTests', () => {
                 ],
                 done
               )
-            }))
+            })
+          })
         })
       })
 
-      describe('user is not a member of the project', () => {
-        it('should not grant access if the user does not accept the invite', done => {
+      describe('user is not a member of the project', function() {
+        it('should not grant access if the user does not accept the invite', function(done) {
           Async.series(
             [
               cb => expectInvitePage(this.user, this.link, cb),
@@ -590,7 +591,7 @@ describe('ProjectInviteTests', () => {
           )
         })
 
-        it('should render the invalid-invite page if the token is invalid', done => {
+        it('should render the invalid-invite page if the token is invalid', function(done) {
           Async.series(
             [
               cb => {
@@ -607,7 +608,7 @@ describe('ProjectInviteTests', () => {
           )
         })
 
-        it('should allow the user to accept the invite and access the project', done => {
+        it('should allow the user to accept the invite and access the project', function(done) {
           Async.series(
             [
               cb => expectInvitePage(this.user, this.link, cb),
@@ -620,13 +621,13 @@ describe('ProjectInviteTests', () => {
       })
     })
 
-    describe('user is not logged in initially', () => {
-      describe('registration prompt workflow with valid token', () => {
-        it('should redirect to the register page', done => {
+    describe('user is not logged in initially', function() {
+      describe('registration prompt workflow with valid token', function() {
+        it('should redirect to the register page', function(done) {
           expectInviteRedirectToRegister(this.user, this.link, done)
         })
 
-        it('should allow user to accept the invite if the user registers a new account', done => {
+        it('should allow user to accept the invite if the user registers a new account', function(done) {
           Async.series(
             [
               cb => expectInviteRedirectToRegister(this.user, this.link, cb),
@@ -646,8 +647,8 @@ describe('ProjectInviteTests', () => {
         })
       })
 
-      describe('registration prompt workflow with non-valid token', () => {
-        it('should redirect to the register page', done => {
+      describe('registration prompt workflow with non-valid token', function() {
+        it('should redirect to the register page', function(done) {
           Async.series(
             [
               cb => expectInviteRedirectToRegister(this.user, this.link, cb),
@@ -657,7 +658,7 @@ describe('ProjectInviteTests', () => {
           )
         })
 
-        it('should display invalid-invite if the user registers a new account', done => {
+        it('should display invalid-invite if the user registers a new account', function(done) {
           const badLink = this.link.replace(
             this.invite.token,
             'not_a_real_token'
@@ -680,8 +681,8 @@ describe('ProjectInviteTests', () => {
         })
       })
 
-      describe('login workflow with valid token', () => {
-        it('should redirect to the register page', done => {
+      describe('login workflow with valid token', function() {
+        it('should redirect to the register page', function(done) {
           Async.series(
             [
               cb => expectInviteRedirectToRegister(this.user, this.link, cb),
@@ -691,7 +692,7 @@ describe('ProjectInviteTests', () => {
           )
         })
 
-        it('should allow the user to login to view the invite', done => {
+        it('should allow the user to login to view the invite', function(done) {
           Async.series(
             [
               cb => expectInviteRedirectToRegister(this.user, this.link, cb),
@@ -704,7 +705,7 @@ describe('ProjectInviteTests', () => {
           )
         })
 
-        it('should allow user to accept the invite if the user logs in', done => {
+        it('should allow user to accept the invite if the user logs in', function(done) {
           Async.series(
             [
               cb => expectInviteRedirectToRegister(this.user, this.link, cb),
@@ -719,8 +720,8 @@ describe('ProjectInviteTests', () => {
         })
       })
 
-      describe('login workflow with non-valid token', () => {
-        it('should redirect to the register page', done => {
+      describe('login workflow with non-valid token', function() {
+        it('should redirect to the register page', function(done) {
           Async.series(
             [
               cb => expectInviteRedirectToRegister(this.user, this.link, cb),
@@ -730,7 +731,7 @@ describe('ProjectInviteTests', () => {
           )
         })
 
-        it('should show the invalid-invite page once the user has logged in', done => {
+        it('should show the invalid-invite page once the user has logged in', function(done) {
           const badLink = this.link.replace(
             this.invite.token,
             'not_a_real_token'

services/web/test/acceptance/src/ProjectStructureMongoLockTest.js

@@ -30,7 +30,7 @@ const _ = require('lodash')
 // It is tested that these methods DO work when the lock has not been taken in
 // other acceptance tests.
 
-describe('ProjectStructureMongoLock', () =>
+describe('ProjectStructureMongoLock', function() {
   describe('whilst a project lock is taken', function() {
     beforeEach(function(done) {
       // We want to instantly fail if the lock is taken
@@ -85,7 +85,7 @@ describe('ProjectStructureMongoLock', () =>
         it(`cannot call ProjectEntityMongoUpdateHandler.${methodName}`, function(done) {
           const method = ProjectEntityMongoUpdateHandler[methodName]
           const args = _.times(method.length - 2, _.constant(null))
-          return method(this.locked_project._id, args, function(err) {
+          return method(this.locked_project._id, args, err => {
             expect(err).to.deep.equal(new Error('Timeout'))
             return done()
           })
@@ -93,7 +93,7 @@ describe('ProjectStructureMongoLock', () =>
       }
 
       it('cannot get the project without a projection', function(done) {
-        return ProjectGetter.getProject(this.locked_project._id, function(err) {
+        return ProjectGetter.getProject(this.locked_project._id, err => {
           expect(err).to.deep.equal(new Error('Timeout'))
           return done()
         })
@@ -103,7 +103,7 @@ describe('ProjectStructureMongoLock', () =>
         return ProjectGetter.getProject(
           this.locked_project._id,
           { rootFolder: true },
-          function(err) {
+          err => {
             expect(err).to.deep.equal(new Error('Timeout'))
             return done()
           }
@@ -143,7 +143,7 @@ describe('ProjectStructureMongoLock', () =>
           this.unlocked_project._id,
           this.unlocked_project.rootFolder[0]._id,
           'new folder',
-          function(err, folder) {
+          (err, folder) => {
             expect(err).to.equal(null)
             expect(folder).to.be.defined
             return done()
@@ -162,4 +162,5 @@ describe('ProjectStructureMongoLock', () =>
         )
       })
     })
-  }))
+  })
+})

services/web/test/acceptance/src/ProjectStructureTests.js

@@ -13,41 +13,41 @@ require('./helpers/MockFileStoreApi')
 require('./helpers/MockProjectHistoryApi')
 const User = require('./helpers/User')
 
-describe('ProjectStructureChanges', () => {
-  beforeEach(done => {
+describe('ProjectStructureChanges', function() {
+  beforeEach(function(done) {
     this.owner = new User()
     this.owner.login(done)
   })
 
-  const createExampleProject = callback => {
-    this.owner.createProject(
+  function createExampleProject(test, callback) {
+    test.owner.createProject(
       'example-project',
       { template: 'example' },
       (error, projectId) => {
         if (error) {
           throw error
         }
-        this.exampleProjectId = projectId
+        test.exampleProjectId = projectId
 
-        ProjectGetter.getProject(this.exampleProjectId, (error, project) => {
+        ProjectGetter.getProject(test.exampleProjectId, (error, project) => {
           if (error) {
             throw error
           }
-          this.rootFolderId = project.rootFolder[0]._id.toString()
+          test.rootFolderId = project.rootFolder[0]._id.toString()
           callback()
         })
       }
     )
   }
 
-  const createExampleDoc = callback => {
-    ProjectGetter.getProject(this.exampleProjectId, (error, project) => {
+  function createExampleDoc(test, callback) {
+    ProjectGetter.getProject(test.exampleProjectId, (error, project) => {
       if (error) {
         throw error
       }
-      this.owner.request.post(
+      test.owner.request.post(
         {
-          uri: `project/${this.exampleProjectId}/doc`,
+          uri: `project/${test.exampleProjectId}/doc`,
           json: {
             name: 'new.tex',
             parent_folder_id: project.rootFolder[0]._id
@@ -60,17 +60,17 @@ describe('ProjectStructureChanges', () => {
           if (res.statusCode < 200 || res.statusCode >= 300) {
             throw new Error(`failed to add doc ${res.statusCode}`)
           }
-          this.exampleDocId = body._id
+          test.exampleDocId = body._id
           callback()
         }
       )
     })
   }
 
-  const createExampleFolder = callback => {
-    this.owner.request.post(
+  function createExampleFolder(test, callback) {
+    test.owner.request.post(
       {
-        uri: `project/${this.exampleProjectId}/folder`,
+        uri: `project/${test.exampleProjectId}/folder`,
         json: {
           name: 'foo'
         }
@@ -82,22 +82,22 @@ describe('ProjectStructureChanges', () => {
         if (res.statusCode < 200 || res.statusCode >= 300) {
           throw new Error(`failed to add doc ${res.statusCode}`)
         }
-        this.exampleFolderId = body._id
+        test.exampleFolderId = body._id
         callback()
       }
     )
   }
 
-  const uploadFile = (file, name, contentType, callback) => {
+  function uploadFile(test, file, name, contentType, callback) {
     const imageFile = fs.createReadStream(
       Path.resolve(Path.join(__dirname, '..', 'files', file))
     )
 
-    this.owner.request.post(
+    test.owner.request.post(
       {
-        uri: `project/${this.exampleProjectId}/upload`,
+        uri: `project/${test.exampleProjectId}/upload`,
         qs: {
-          folder_id: this.rootFolderId
+          folder_id: test.rootFolderId
         },
         formData: {
           qqfile: {
@@ -117,17 +117,17 @@ describe('ProjectStructureChanges', () => {
           throw new Error(`failed to upload file ${res.statusCode}`)
         }
 
-        this.exampleFileId = JSON.parse(body).entity_id
+        test.exampleFileId = JSON.parse(body).entity_id
         callback()
       }
     )
   }
 
-  const uploadExampleFile = callback => {
-    uploadFile('1pixel.png', '1pixel.png', 'image/png', callback)
+  function uploadExampleFile(test, callback) {
+    uploadFile(test, '1pixel.png', '1pixel.png', 'image/png', callback)
   }
 
-  const uploadExampleProject = (zipFilename, options, callback) => {
+  function uploadExampleProject(test, zipFilename, options, callback) {
     if (typeof options === 'function') {
       callback = options
       options = {}
@@ -137,7 +137,7 @@ describe('ProjectStructureChanges', () => {
       Path.resolve(Path.join(__dirname, '..', 'files', zipFilename))
     )
 
-    this.owner.request.post(
+    test.owner.request.post(
       {
         uri: 'project/new/upload',
         formData: {
@@ -154,17 +154,17 @@ describe('ProjectStructureChanges', () => {
         ) {
           throw new Error(`failed to upload project ${res.statusCode}`)
         }
-        this.uploadedProjectId = JSON.parse(body).project_id
-        this.res = res
+        test.uploadedProjectId = JSON.parse(body).project_id
+        test.res = res
         callback()
       }
     )
   }
 
-  const moveItem = (type, itemId, folderId, callback) => {
-    this.owner.request.post(
+  function moveItem(test, type, itemId, folderId, callback) {
+    test.owner.request.post(
       {
-        uri: `project/${this.exampleProjectId}/${type}/${itemId}/move`,
+        uri: `project/${test.exampleProjectId}/${type}/${itemId}/move`,
         json: {
           folder_id: folderId
         }
@@ -182,10 +182,10 @@ describe('ProjectStructureChanges', () => {
     )
   }
 
-  const renameItem = (type, itemId, name, callback) => {
-    this.owner.request.post(
+  function renameItem(test, type, itemId, name, callback) {
+    test.owner.request.post(
       {
-        uri: `project/${this.exampleProjectId}/${type}/${itemId}/rename`,
+        uri: `project/${test.exampleProjectId}/${type}/${itemId}/rename`,
         json: {
           name: name
         }
@@ -203,10 +203,10 @@ describe('ProjectStructureChanges', () => {
     )
   }
 
-  const deleteItem = (type, itemId, callback) => {
-    this.owner.request.delete(
+  function deleteItem(test, type, itemId, callback) {
+    test.owner.request.delete(
       {
-        uri: `project/${this.exampleProjectId}/${type}/${itemId}`
+        uri: `project/${test.exampleProjectId}/${type}/${itemId}`
       },
       (error, res) => {
         if (error) {
@@ -220,26 +220,26 @@ describe('ProjectStructureChanges', () => {
     )
   }
 
-  const verifyVersionIncremented = (updateVersion, increment, callback) => {
-    expect(updateVersion).to.equal(this.project0.version + increment)
+  function verifyVersionIncremented(test, updateVersion, increment, callback) {
+    expect(updateVersion).to.equal(test.project0.version + increment)
 
-    ProjectGetter.getProject(this.exampleProjectId, (error, newProject) => {
+    ProjectGetter.getProject(test.exampleProjectId, (error, newProject) => {
       if (error) {
         throw error
       }
 
-      expect(newProject.version).to.equal(this.project0.version + increment)
+      expect(newProject.version).to.equal(test.project0.version + increment)
       callback()
     })
   }
 
-  describe('creating a project from the example template', () => {
-    beforeEach(done => {
+  describe('creating a project from the example template', function() {
+    beforeEach(function(done) {
       MockDocUpdaterApi.clearProjectStructureUpdates()
-      createExampleProject(done)
+      createExampleProject(this, done)
     })
 
-    it('should version creating a doc', () => {
+    it('should version creating a doc', function() {
       const {
         docUpdates: updates,
         version
@@ -256,7 +256,7 @@ describe('ProjectStructureChanges', () => {
       expect(version).to.equal(3)
     })
 
-    it('should version creating a file', () => {
+    it('should version creating a file', function() {
       const {
         fileUpdates: updates,
         version
@@ -270,10 +270,10 @@ describe('ProjectStructureChanges', () => {
     })
   })
 
-  describe('duplicating a project', () => {
-    beforeEach(done => {
+  describe('duplicating a project', function() {
+    beforeEach(function(done) {
       MockDocUpdaterApi.clearProjectStructureUpdates()
-      createExampleProject(() => {
+      createExampleProject(this, () => {
         this.owner.request.post(
           {
             uri: `/Project/${this.exampleProjectId}/clone`,
@@ -295,7 +295,7 @@ describe('ProjectStructureChanges', () => {
       })
     })
 
-    it('should version the docs created', () => {
+    it('should version the docs created', function() {
       const {
         docUpdates: updates,
         version
@@ -312,7 +312,7 @@ describe('ProjectStructureChanges', () => {
       expect(version).to.equal(3)
     })
 
-    it('should version the files created', () => {
+    it('should version the files created', function() {
       const {
         fileUpdates: updates,
         version
@@ -326,21 +326,21 @@ describe('ProjectStructureChanges', () => {
     })
   })
 
-  describe('adding a doc', () => {
-    beforeEach(done => {
-      createExampleProject(() => {
+  describe('adding a doc', function() {
+    beforeEach(function(done) {
+      createExampleProject(this, () => {
         MockDocUpdaterApi.clearProjectStructureUpdates()
         ProjectGetter.getProject(this.exampleProjectId, (error, project) => {
           if (error) {
             throw error
           }
           this.project0 = project
-          createExampleDoc(done)
+          createExampleDoc(this, done)
         })
       })
     })
 
-    it('should version the doc added', done => {
+    it('should version the doc added', function(done) {
       const {
         docUpdates: updates,
         version
@@ -351,16 +351,16 @@ describe('ProjectStructureChanges', () => {
       expect(update.pathname).to.equal('/new.tex')
       expect(update.docLines).to.be.a('string')
 
-      verifyVersionIncremented(version, 1, done)
+      verifyVersionIncremented(this, version, 1, done)
     })
   })
 
-  describe('uploading a project', () => {
-    beforeEach(done => {
-      uploadExampleProject('test_project.zip', done)
+  describe('uploading a project', function() {
+    beforeEach(function(done) {
+      uploadExampleProject(this, 'test_project.zip', done)
     })
 
-    it('should version the docs created', () => {
+    it('should version the docs created', function() {
       const {
         docUpdates: updates,
         version
@@ -373,7 +373,7 @@ describe('ProjectStructureChanges', () => {
       expect(version).to.equal(2)
     })
 
-    it('should version the files created', () => {
+    it('should version the files created', function() {
       const {
         fileUpdates: updates,
         version
@@ -387,13 +387,13 @@ describe('ProjectStructureChanges', () => {
     })
   })
 
-  describe('uploading a project with a name', () => {
-    beforeEach(done => {
+  describe('uploading a project with a name', function() {
+    beforeEach(function(done) {
       this.testProjectName = 'wombat'
-      uploadExampleProject('test_project_with_name.zip', done)
+      uploadExampleProject(this, 'test_project_with_name.zip', done)
     })
 
-    it('should set the project name from the zip contents', done => {
+    it('should set the project name from the zip contents', function(done) {
       ProjectGetter.getProject(this.uploadedProjectId, (error, project) => {
         expect(error).not.to.exist
         expect(project.name).to.equal(this.testProjectName)
@@ -402,13 +402,13 @@ describe('ProjectStructureChanges', () => {
     })
   })
 
-  describe('uploading a project with an invalid name', () => {
-    beforeEach(done => {
+  describe('uploading a project with an invalid name', function() {
+    beforeEach(function(done) {
       this.testProjectMatch = /^bad[^\\]+name$/
-      uploadExampleProject('test_project_with_invalid_name.zip', done)
+      uploadExampleProject(this, 'test_project_with_invalid_name.zip', done)
     })
 
-    it('should set the project name from the zip contents', done => {
+    it('should set the project name from the zip contents', function(done) {
       ProjectGetter.getProject(this.uploadedProjectId, (error, project) => {
         expect(error).not.to.exist
         expect(project.name).to.match(this.testProjectMatch)
@@ -417,43 +417,46 @@ describe('ProjectStructureChanges', () => {
     })
   })
 
-  describe('uploading an empty zipfile', () => {
-    beforeEach(done => {
+  describe('uploading an empty zipfile', function() {
+    beforeEach(function(done) {
       uploadExampleProject(
+        this,
         'test_project_empty.zip',
         { allowBadStatus: true },
         done
       )
     })
 
-    it('should fail with 422 error', () => {
+    it('should fail with 422 error', function() {
       expect(this.res.statusCode).to.equal(422)
     })
   })
 
-  describe('uploading a zipfile containing only empty directories', () => {
-    beforeEach(done => {
+  describe('uploading a zipfile containing only empty directories', function() {
+    beforeEach(function(done) {
       uploadExampleProject(
+        this,
         'test_project_with_empty_folder.zip',
         { allowBadStatus: true },
         done
       )
     })
 
-    it('should fail with 422 error', () => {
+    it('should fail with 422 error', function() {
       expect(this.res.statusCode).to.equal(422)
     })
   })
 
-  describe('uploading a project with a shared top-level folder', () => {
-    beforeEach(done => {
+  describe('uploading a project with a shared top-level folder', function() {
+    beforeEach(function(done) {
       uploadExampleProject(
+        this,
         'test_project_with_shared_top_level_folder.zip',
         done
       )
     })
 
-    it('should not create the top-level folder', done => {
+    it('should not create the top-level folder', function(done) {
       ProjectGetter.getProject(this.uploadedProjectId, (error, project) => {
         expect(error).not.to.exist
         expect(project.rootFolder[0].folders.length).to.equal(0)
@@ -463,12 +466,16 @@ describe('ProjectStructureChanges', () => {
     })
   })
 
-  describe('uploading a project with backslashes in the path names', () => {
-    beforeEach(done => {
-      uploadExampleProject('test_project_with_backslash_in_filename.zip', done)
+  describe('uploading a project with backslashes in the path names', function() {
+    beforeEach(function(done) {
+      uploadExampleProject(
+        this,
+        'test_project_with_backslash_in_filename.zip',
+        done
+      )
     })
 
-    it('should treat the backslash as a directory separator', done => {
+    it('should treat the backslash as a directory separator', function(done) {
       ProjectGetter.getProject(this.uploadedProjectId, (error, project) => {
         expect(error).not.to.exist
         expect(project.rootFolder[0].folders[0].name).to.equal('styles')
@@ -478,12 +485,12 @@ describe('ProjectStructureChanges', () => {
     })
   })
 
-  describe('uploading a project with files in different encodings', () => {
-    beforeEach(done => {
-      uploadExampleProject('charsets/charsets.zip', done)
+  describe('uploading a project with files in different encodings', function() {
+    beforeEach(function(done) {
+      uploadExampleProject(this, 'charsets/charsets.zip', done)
     })
 
-    it('should correctly parse windows-1252', () => {
+    it('should correctly parse windows-1252', function() {
       const {
         docUpdates: updates
       } = MockDocUpdaterApi.getProjectStructureUpdates(this.uploadedProjectId)
@@ -496,7 +503,7 @@ describe('ProjectStructureChanges', () => {
       )
     })
 
-    it('should correctly parse German utf8', () => {
+    it('should correctly parse German utf8', function() {
       const {
         docUpdates: updates
       } = MockDocUpdaterApi.getProjectStructureUpdates(this.uploadedProjectId)
@@ -509,7 +516,7 @@ describe('ProjectStructureChanges', () => {
       )
     })
 
-    it('should correctly parse little-endian utf16', () => {
+    it('should correctly parse little-endian utf16', function() {
       const {
         docUpdates: updates
       } = MockDocUpdaterApi.getProjectStructureUpdates(this.uploadedProjectId)
@@ -522,7 +529,7 @@ describe('ProjectStructureChanges', () => {
       )
     })
 
-    it('should correctly parse Greek utf8', () => {
+    it('should correctly parse Greek utf8', function() {
       const {
         docUpdates: updates
       } = MockDocUpdaterApi.getProjectStructureUpdates(this.uploadedProjectId)
@@ -536,21 +543,21 @@ describe('ProjectStructureChanges', () => {
     })
   })
 
-  describe('uploading a file', () => {
-    beforeEach(done => {
-      createExampleProject(() => {
+  describe('uploading a file', function() {
+    beforeEach(function(done) {
+      createExampleProject(this, () => {
         MockDocUpdaterApi.clearProjectStructureUpdates()
         ProjectGetter.getProject(this.exampleProjectId, (error, project) => {
           if (error) {
             throw error
           }
           this.project0 = project
-          uploadExampleFile(done)
+          uploadExampleFile(this, done)
         })
       })
     })
 
-    it('should version a newly uploaded file', done => {
+    it('should version a newly uploaded file', function(done) {
       const {
         fileUpdates: updates,
         version
@@ -562,13 +569,13 @@ describe('ProjectStructureChanges', () => {
       expect(update.url).to.be.a('string')
 
       // one file upload
-      verifyVersionIncremented(version, 1, done)
+      verifyVersionIncremented(this, version, 1, done)
     })
 
-    it('should version a replacement file', done => {
+    it('should version a replacement file', function(done) {
       MockDocUpdaterApi.clearProjectStructureUpdates()
 
-      uploadFile('2pixel.png', '1pixel.png', 'image/png', () => {
+      uploadFile(this, '2pixel.png', '1pixel.png', 'image/png', () => {
         const {
           fileUpdates: updates,
           version
@@ -583,17 +590,17 @@ describe('ProjectStructureChanges', () => {
         expect(update.url).to.be.a('string')
 
         // two file uploads
-        verifyVersionIncremented(version, 2, done)
+        verifyVersionIncremented(this, version, 2, done)
       })
     })
   })
 
-  describe('moving entities', () => {
-    beforeEach(done => {
-      createExampleProject(() => {
-        createExampleDoc(() => {
-          uploadExampleFile(() => {
-            createExampleFolder(() => {
+  describe('moving entities', function() {
+    beforeEach(function(done) {
+      createExampleProject(this, () => {
+        createExampleDoc(this, () => {
+          uploadExampleFile(this, () => {
+            createExampleFolder(this, () => {
               ProjectGetter.getProject(
                 this.exampleProjectId,
                 (error, project) => {
@@ -611,8 +618,8 @@ describe('ProjectStructureChanges', () => {
       })
     })
 
-    it('should version moving a doc', done => {
-      moveItem('doc', this.exampleDocId, this.exampleFolderId, () => {
+    it('should version moving a doc', function(done) {
+      moveItem(this, 'doc', this.exampleDocId, this.exampleFolderId, () => {
         const {
           docUpdates: updates,
           version
@@ -624,12 +631,12 @@ describe('ProjectStructureChanges', () => {
         expect(update.newPathname).to.equal('/foo/new.tex')
 
         // 2, because it's a delete and then add
-        verifyVersionIncremented(version, 2, done)
+        verifyVersionIncremented(this, version, 2, done)
       })
     })
 
-    it('should version moving a file', done => {
-      moveItem('file', this.exampleFileId, this.exampleFolderId, () => {
+    it('should version moving a file', function(done) {
+      moveItem(this, 'file', this.exampleFileId, this.exampleFolderId, () => {
         const {
           fileUpdates: updates,
           version
@@ -641,12 +648,12 @@ describe('ProjectStructureChanges', () => {
         expect(update.newPathname).to.equal('/foo/1pixel.png')
 
         // 2, because it's a delete and then add
-        verifyVersionIncremented(version, 2, done)
+        verifyVersionIncremented(this, version, 2, done)
       })
     })
 
-    it('should version moving a folder', done => {
-      moveItem('doc', this.exampleDocId, this.exampleFolderId, () => {
+    it('should version moving a folder', function(done) {
+      moveItem(this, 'doc', this.exampleDocId, this.exampleFolderId, () => {
         MockDocUpdaterApi.clearProjectStructureUpdates()
 
         this.owner.request.post(
@@ -662,7 +669,7 @@ describe('ProjectStructureChanges', () => {
             }
             const newFolderId = body._id
 
-            moveItem('folder', this.exampleFolderId, newFolderId, () => {
+            moveItem(this, 'folder', this.exampleFolderId, newFolderId, () => {
               const {
                 docUpdates: updates,
                 version
@@ -676,7 +683,7 @@ describe('ProjectStructureChanges', () => {
               expect(update.newPathname).to.equal('/bar/foo/new.tex')
 
               // 5, because it's two file moves plus a folder
-              verifyVersionIncremented(version, 5, done)
+              verifyVersionIncremented(this, version, 5, done)
             })
           }
         )
@@ -684,40 +691,47 @@ describe('ProjectStructureChanges', () => {
     })
   })
 
-  describe('renaming entities', () => {
-    beforeEach(done => {
-      createExampleProject(() => {
-        createExampleDoc(() => {
-          uploadExampleFile(() => {
-            createExampleFolder(() => {
-              moveItem('doc', this.exampleDocId, this.exampleFolderId, () => {
-                moveItem(
-                  'file',
-                  this.exampleFileId,
-                  this.exampleFolderId,
-                  () => {
-                    MockDocUpdaterApi.clearProjectStructureUpdates()
-                    ProjectGetter.getProject(
-                      this.exampleProjectId,
-                      (error, project) => {
-                        if (error) {
-                          throw error
+  describe('renaming entities', function() {
+    beforeEach(function(done) {
+      createExampleProject(this, () => {
+        createExampleDoc(this, () => {
+          uploadExampleFile(this, () => {
+            createExampleFolder(this, () => {
+              moveItem(
+                this,
+                'doc',
+                this.exampleDocId,
+                this.exampleFolderId,
+                () => {
+                  moveItem(
+                    this,
+                    'file',
+                    this.exampleFileId,
+                    this.exampleFolderId,
+                    () => {
+                      MockDocUpdaterApi.clearProjectStructureUpdates()
+                      ProjectGetter.getProject(
+                        this.exampleProjectId,
+                        (error, project) => {
+                          if (error) {
+                            throw error
+                          }
+                          this.project0 = project
+                          done()
                         }
-                        this.project0 = project
-                        done()
-                      }
-                    )
-                  }
-                )
-              })
+                      )
+                    }
+                  )
+                }
+              )
             })
           })
         })
       })
     })
 
-    it('should version renaming a doc', done => {
-      renameItem('Doc', this.exampleDocId, 'wombat.tex', () => {
+    it('should version renaming a doc', function(done) {
+      renameItem(this, 'Doc', this.exampleDocId, 'wombat.tex', () => {
         const {
           docUpdates: updates,
           version
@@ -728,12 +742,12 @@ describe('ProjectStructureChanges', () => {
         expect(update.pathname).to.equal('/foo/new.tex')
         expect(update.newPathname).to.equal('/foo/wombat.tex')
 
-        verifyVersionIncremented(version, 1, done)
+        verifyVersionIncremented(this, version, 1, done)
       })
     })
 
-    it('should version renaming a file', done => {
-      renameItem('file', this.exampleFileId, 'potato.png', () => {
+    it('should version renaming a file', function(done) {
+      renameItem(this, 'file', this.exampleFileId, 'potato.png', () => {
         const {
           fileUpdates: updates,
           version
@@ -744,12 +758,12 @@ describe('ProjectStructureChanges', () => {
         expect(update.pathname).to.equal('/foo/1pixel.png')
         expect(update.newPathname).to.equal('/foo/potato.png')
 
-        verifyVersionIncremented(version, 1, done)
+        verifyVersionIncremented(this, version, 1, done)
       })
     })
 
-    it('should version renaming a folder', done => {
-      renameItem('folder', this.exampleFolderId, 'giraffe', () => {
+    it('should version renaming a folder', function(done) {
+      renameItem(this, 'folder', this.exampleFolderId, 'giraffe', () => {
         const {
           docUpdates,
           fileUpdates,
@@ -767,45 +781,52 @@ describe('ProjectStructureChanges', () => {
         expect(fileUpdate.pathname).to.equal('/foo/1pixel.png')
         expect(fileUpdate.newPathname).to.equal('/giraffe/1pixel.png')
 
-        verifyVersionIncremented(version, 1, done)
+        verifyVersionIncremented(this, version, 1, done)
       })
     })
   })
 
-  describe('deleting entities', () => {
-    beforeEach(done => {
-      createExampleProject(() => {
-        createExampleFolder(() => {
-          createExampleDoc(() => {
-            uploadExampleFile(() => {
-              moveItem('doc', this.exampleDocId, this.exampleFolderId, () => {
-                moveItem(
-                  'file',
-                  this.exampleFileId,
-                  this.exampleFolderId,
-                  () => {
-                    MockDocUpdaterApi.clearProjectStructureUpdates()
-                    ProjectGetter.getProject(
-                      this.exampleProjectId,
-                      (error, project) => {
-                        if (error) {
-                          throw error
+  describe('deleting entities', function() {
+    beforeEach(function(done) {
+      createExampleProject(this, () => {
+        createExampleFolder(this, () => {
+          createExampleDoc(this, () => {
+            uploadExampleFile(this, () => {
+              moveItem(
+                this,
+                'doc',
+                this.exampleDocId,
+                this.exampleFolderId,
+                () => {
+                  moveItem(
+                    this,
+                    'file',
+                    this.exampleFileId,
+                    this.exampleFolderId,
+                    () => {
+                      MockDocUpdaterApi.clearProjectStructureUpdates()
+                      ProjectGetter.getProject(
+                        this.exampleProjectId,
+                        (error, project) => {
+                          if (error) {
+                            throw error
+                          }
+                          this.project0 = project
+                          done()
                         }
-                        this.project0 = project
-                        done()
-                      }
-                    )
-                  }
-                )
-              })
+                      )
+                    }
+                  )
+                }
+              )
             })
           })
         })
       })
     })
 
-    it('should version deleting a folder', done => {
-      deleteItem('folder', this.exampleFolderId, () => {
+    it('should version deleting a folder', function(done) {
+      deleteItem(this, 'folder', this.exampleFolderId, () => {
         const {
           docUpdates,
           fileUpdates,
@@ -823,13 +844,13 @@ describe('ProjectStructureChanges', () => {
         expect(fileUpdate.pathname).to.equal('/foo/1pixel.png')
         expect(fileUpdate.newPathname).to.equal('')
 
-        verifyVersionIncremented(version, 1, done)
+        verifyVersionIncremented(this, version, 1, done)
       })
     })
   })
 
-  describe('tpds', () => {
-    beforeEach(done => {
+  describe('tpds', function() {
+    beforeEach(function(done) {
       this.tpdsProjectName = `tpds-project-${new ObjectId().toString()}`
       this.owner.createProject(this.tpdsProjectName, (error, projectId) => {
         if (error) {
@@ -850,7 +871,7 @@ describe('ProjectStructureChanges', () => {
       })
     })
 
-    it('should version adding a doc', done => {
+    it('should version adding a doc', function(done) {
       const texFile = fs.createReadStream(
         Path.resolve(Path.join(__dirname, '..', 'files', 'test.tex'))
       )
@@ -887,13 +908,13 @@ describe('ProjectStructureChanges', () => {
         expect(update.pathname).to.equal('/test.tex')
         expect(update.docLines).to.equal('Test')
 
-        verifyVersionIncremented(version, 1, done)
+        verifyVersionIncremented(this, version, 1, done)
       })
 
       texFile.pipe(req)
     })
 
-    it('should version adding a new file', done => {
+    it('should version adding a new file', function(done) {
       const imageFile = fs.createReadStream(
         Path.resolve(Path.join(__dirname, '..', 'files', '1pixel.png'))
       )
@@ -932,16 +953,16 @@ describe('ProjectStructureChanges', () => {
         expect(update.pathname).to.equal('/1pixel.png')
         expect(update.url).to.be.a('string')
 
-        verifyVersionIncremented(version, 1, done)
+        verifyVersionIncremented(this, version, 1, done)
       })
 
       imageFile.pipe(req)
     })
 
-    describe('when there are files in the project', () => {
-      beforeEach(done => {
-        uploadExampleFile(() => {
-          createExampleDoc(() => {
+    describe('when there are files in the project', function() {
+      beforeEach(function(done) {
+        uploadExampleFile(this, () => {
+          createExampleDoc(this, () => {
             ProjectGetter.getProject(
               this.exampleProjectId,
               (error, project) => {
@@ -957,7 +978,7 @@ describe('ProjectStructureChanges', () => {
         })
       })
 
-      it('should version replacing a file', done => {
+      it('should version replacing a file', function(done) {
         const imageFile = fs.createReadStream(
           Path.resolve(Path.join(__dirname, '..', 'files', '2pixel.png'))
         )
@@ -1002,13 +1023,13 @@ describe('ProjectStructureChanges', () => {
           expect(update.pathname).to.equal('/1pixel.png')
           expect(update.url).to.be.a('string')
 
-          verifyVersionIncremented(version, 1, done)
+          verifyVersionIncremented(this, version, 1, done)
         })
 
         imageFile.pipe(req)
       })
 
-      it('should version deleting a doc', done => {
+      it('should version deleting a doc', function(done) {
         this.owner.request.delete(
           {
             uri: `/user/${this.owner._id}/update/${
@@ -1040,24 +1061,25 @@ describe('ProjectStructureChanges', () => {
             expect(update.pathname).to.equal('/new.tex')
             expect(update.newPathname).to.equal('')
 
-            verifyVersionIncremented(version, 1, done)
+            verifyVersionIncremented(this, version, 1, done)
           }
         )
       })
     })
   })
 
-  describe('uploading a document', () => {
-    beforeEach(done => {
-      createExampleProject(() => {
+  describe('uploading a document', function() {
+    beforeEach(function(done) {
+      createExampleProject(this, () => {
         MockDocUpdaterApi.clearProjectStructureUpdates()
         done()
       })
     })
 
-    describe('with an unusual character set', () => {
-      it('should correctly handle utf16-le data', done => {
+    describe('with an unusual character set', function() {
+      it('should correctly handle utf16-le data', function(done) {
         uploadFile(
+          this,
           'charsets/test-greek-utf16-le-bom.tex',
           'test-greek-utf16-le-bom.tex',
           'text/x-tex',
@@ -1078,8 +1100,9 @@ describe('ProjectStructureChanges', () => {
         )
       })
 
-      it('should correctly handle windows1252/iso-8859-1/latin1 data', done => {
+      it('should correctly handle windows1252/iso-8859-1/latin1 data', function(done) {
         uploadFile(
+          this,
           'charsets/test-german-windows-1252.tex',
           'test-german-windows-1252.tex',
           'text/x-tex',

services/web/test/acceptance/src/ProxyUrls.js

@@ -16,7 +16,7 @@ const request = require('./helpers/request')
 const MockV1Api = require('./helpers/MockV1Api')
 
 const assertResponse = (path, expectedStatusCode, expectedBody, cb) =>
-  request.get(path, function(error, response) {
+  request.get(path, (error, response) => {
     should.not.exist(error)
     response.statusCode.should.equal(expectedStatusCode)
     if (expectedBody) {
@@ -30,17 +30,18 @@ describe('ProxyUrls', function() {
     return this.timeout(1000)
   })
 
-  it('proxy static URLs', done =>
-    async.series(
+  it('proxy static URLs', function(done) {
+    return async.series(
       [
         cb => assertResponse('/institutions/list', 200, [], cb),
         cb => assertResponse('/institutions/domains', 200, [], cb)
       ],
       done
-    ))
+    )
+  })
 
-  it('proxy dynamic URLs', done =>
-    async.series(
+  it('proxy dynamic URLs', function(done) {
+    return async.series(
       [
         cb =>
           assertResponse(
@@ -58,17 +59,20 @@ describe('ProxyUrls', function() {
           )
       ],
       done
-    ))
+    )
+  })
 
-  it('return 404 if proxy is not set', done =>
-    async.series(
+  it('return 404 if proxy is not set', function(done) {
+    return async.series(
       [cb => assertResponse('/institutions/foobar', 404, null, cb)],
       done
-    ))
+    )
+  })
 
-  it('handle missing baseUrl', done =>
-    async.series(
+  it('handle missing baseUrl', function(done) {
+    return async.series(
       [cb => assertResponse('/proxy/missing/baseUrl', 500, null, cb)],
       done
-    ))
+    )
+  })
 })

services/web/test/acceptance/src/RedirectUrlsTests.js

@@ -16,7 +16,7 @@ const request = require('./helpers/request')
 const MockV1Api = require('./helpers/MockV1Api')
 
 const assertRedirect = (method, path, expectedStatusCode, destination, cb) =>
-  request[method](path, function(error, response) {
+  request[method](path, (error, response) => {
     should.not.exist(error)
     response.statusCode.should.equal(expectedStatusCode)
     response.headers.location.should.equal(destination)
@@ -28,61 +28,68 @@ describe('RedirectUrls', function() {
     return this.timeout(1000)
   })
 
-  it('proxy static URLs', done =>
-    assertRedirect('get', '/redirect/one', 302, '/destination/one', done))
+  it('proxy static URLs', function(done) {
+    return assertRedirect('get', '/redirect/one', 302, '/destination/one', done)
+  })
 
-  it('proxy dynamic URLs', done =>
-    assertRedirect(
+  it('proxy dynamic URLs', function(done) {
+    return assertRedirect(
       'get',
       '/redirect/params/42',
       302,
       '/destination/42/params',
       done
-    ))
+    )
+  })
 
-  it('proxy URLs with baseUrl', done =>
-    assertRedirect(
+  it('proxy URLs with baseUrl', function(done) {
+    return assertRedirect(
       'get',
       '/redirect/base_url',
       302,
       'https://example.com/destination/base_url',
       done
-    ))
+    )
+  })
 
-  it('proxy URLs with POST with a 307', done =>
-    assertRedirect(
+  it('proxy URLs with POST with a 307', function(done) {
+    return assertRedirect(
       'post',
       '/redirect/get_and_post',
       307,
       '/destination/get_and_post',
       done
-    ))
+    )
+  })
 
-  it('proxy URLs with multiple support methods', done =>
-    assertRedirect(
+  it('proxy URLs with multiple support methods', function(done) {
+    return assertRedirect(
       'get',
       '/redirect/get_and_post',
       302,
       '/destination/get_and_post',
       done
-    ))
+    )
+  })
 
-  it('redirects with query params', done =>
-    assertRedirect(
+  it('redirects with query params', function(done) {
+    return assertRedirect(
       'get',
       '/redirect/qs?foo=bar&baz[]=qux1&baz[]=qux2',
       302,
       '/destination/qs?foo=bar&baz[]=qux1&baz[]=qux2',
       done
-    ))
+    )
+  })
 
-  it("skips redirects if the 'skip-redirects' header is set", done =>
-    request.get(
+  it("skips redirects if the 'skip-redirects' header is set", function(done) {
+    return request.get(
       { url: '/redirect/one', headers: { 'x-skip-redirects': 'true' } },
-      function(error, response) {
+      (error, response) => {
         should.not.exist(error)
         response.statusCode.should.equal(404)
         return done()
       }
-    ))
+    )
+  })
 })

services/web/test/acceptance/src/RegistrationTests.js

@@ -59,7 +59,7 @@ const tryLoginThroughRegistrationForm = function(
   if (callback == null) {
     callback = function(err, response, body) {}
   }
-  return user.getCsrfToken(function(err) {
+  return user.getCsrfToken(err => {
     if (err != null) {
       return callback(err)
     }
@@ -290,7 +290,7 @@ describe('LoginViaRegistration', function() {
       return this.user1.addEmail(secondaryEmail, err => {
         return this.user1.loginWith(secondaryEmail, err => {
           expect(err != null).to.equal(false)
-          return this.user1.isLoggedIn(function(err, isLoggedIn) {
+          return this.user1.isLoggedIn((err, isLoggedIn) => {
             expect(isLoggedIn).to.equal(false)
             return done()
           })
@@ -299,7 +299,7 @@ describe('LoginViaRegistration', function() {
     })
 
     it('should have user1 login', function(done) {
-      return this.user1.login(function(err) {
+      return this.user1.login(err => {
         expect(err != null).to.equal(false)
         return done()
       })

services/web/test/acceptance/src/RestoringFilesTest.js

@@ -128,7 +128,7 @@ describe('RestoringFiles', function() {
               version: 42
             }
           },
-          function(error, response, body) {
+          (error, response, body) => {
             if (error != null) {
               throw error
             }
@@ -175,7 +175,7 @@ describe('RestoringFiles', function() {
               version: 42
             }
           },
-          function(error, response, body) {
+          (error, response, body) => {
             if (error != null) {
               throw error
             }
@@ -230,7 +230,7 @@ describe('RestoringFiles', function() {
                   version: 42
                 }
               },
-              function(error, response, body) {
+              (error, response, body) => {
                 if (error != null) {
                   throw error
                 }
@@ -276,7 +276,7 @@ describe('RestoringFiles', function() {
               version: 42
             }
           },
-          function(error, response, body) {
+          (error, response, body) => {
             if (error != null) {
               throw error
             }
@@ -321,7 +321,7 @@ describe('RestoringFiles', function() {
               version: 42
             }
           },
-          function(error, response, body) {
+          (error, response, body) => {
             if (error != null) {
               throw error
             }

services/web/test/acceptance/src/SecurityHeadersTests.js

@@ -48,23 +48,26 @@ describe('SecurityHeaders', function() {
     return (this.user = new User())
   })
 
-  it('should not have x-powered-by header', done =>
-    request.get('/', (err, res, body) => {
+  it('should not have x-powered-by header', function(done) {
+    return request.get('/', (err, res, body) => {
       assert.isUndefined(res.headers['x-powered-by'])
       return done()
-    }))
+    })
+  })
 
-  it('should have all common headers', done =>
-    request.get('/', (err, res, body) => {
+  it('should have all common headers', function(done) {
+    return request.get('/', (err, res, body) => {
       assert_has_common_headers(res)
       return done()
-    }))
+    })
+  })
 
-  it('should not have cache headers on public pages', done =>
-    request.get('/', (err, res, body) => {
+  it('should not have cache headers on public pages', function(done) {
+    return request.get('/', (err, res, body) => {
       assert_has_no_cache_headers(res)
       return done()
-    }))
+    })
+  })
 
   it('should have cache headers when user is logged in', function(done) {
     return async.series(

services/web/test/acceptance/src/SessionTests.js

@@ -32,7 +32,7 @@ describe('Sessions', function() {
     )
   })
 
-  describe('one session', () =>
+  describe('one session', function() {
     it('should have one session in UserSessions set', function(done) {
       return async.series(
         [
@@ -81,7 +81,8 @@ describe('Sessions', function() {
           return done()
         }
       )
-    }))
+    })
+  })
 
   describe('two sessions', function() {
     beforeEach(function() {

services/web/test/acceptance/src/SettingsTests.js

@@ -42,7 +42,7 @@ describe('SettingsPage', function() {
   })
 
   it('load settings page', function(done) {
-    return this.user.getUserSettingsPage(function(err, statusCode) {
+    return this.user.getUserSettingsPage((err, statusCode) => {
       statusCode.should.equal(200)
       return done()
     })
@@ -52,7 +52,7 @@ describe('SettingsPage', function() {
     const newEmail = 'foo@bar.com'
     return this.user.updateSettings({ email: newEmail }, error => {
       should.not.exist(error)
-      return this.user.get(function(error, user) {
+      return this.user.get((error, user) => {
         user.email.should.equal(newEmail)
         user.emails.length.should.equal(1)
         user.emails[0].email.should.equal(newEmail)

services/web/test/acceptance/src/SubscriptionTests.js

@@ -145,7 +145,7 @@ describe('Subscriptions', function() {
         // rebuild the view model with the redemptions
         return SubscriptionViewModelBuilder.buildUsersSubscriptionViewModel(
           this.user,
-          function(error, data) {
+          (error, data) => {
             expect(error).to.not.exist
             expect(
               data.personalSubscription.recurly.activeCoupons

services/web/test/acceptance/src/TokenAccessTests.js

@@ -24,11 +24,7 @@ const try_read_access = (user, project_id, test, callback) =>
   async.series(
     [
       cb =>
-        user.request.get(`/project/${project_id}`, function(
-          error,
-          response,
-          body
-        ) {
+        user.request.get(`/project/${project_id}`, (error, response, body) => {
           if (error != null) {
             return cb(error)
           }
@@ -36,17 +32,16 @@ const try_read_access = (user, project_id, test, callback) =>
           return cb()
         }),
       cb =>
-        user.request.get(`/project/${project_id}/download/zip`, function(
-          error,
-          response,
-          body
-        ) {
-          if (error != null) {
-            return cb(error)
+        user.request.get(
+          `/project/${project_id}/download/zip`,
+          (error, response, body) => {
+            if (error != null) {
+              return cb(error)
+            }
+            test(response, body)
+            return cb()
           }
-          test(response, body)
-          return cb()
-        })
+        )
     ],
     callback
   )
@@ -55,7 +50,7 @@ const try_read_only_token_access = (user, token, test, callback) =>
   async.series(
     [
       cb =>
-        user.request.get(`/read/${token}`, function(error, response, body) {
+        user.request.get(`/read/${token}`, (error, response, body) => {
           if (error != null) {
             return cb(error)
           }
@@ -70,7 +65,7 @@ const try_read_and_write_token_access = (user, token, test, callback) =>
   async.series(
     [
       cb =>
-        user.request.get(`/${token}`, function(error, response, body) {
+        user.request.get(`/${token}`, (error, response, body) => {
           if (error != null) {
             return cb(error)
           }
@@ -102,7 +97,7 @@ const try_content_access = function(user, project_id, test, callback) {
       json: true,
       jar: false
     },
-    function(error, response, body) {
+    (error, response, body) => {
       if (error != null) {
         return callback(error)
       }
@@ -142,7 +137,7 @@ const try_anon_content_access = function(
       json: true,
       jar: false
     },
-    function(error, response, body) {
+    (error, response, body) => {
       if (error != null) {
         return callback(error)
       }
@@ -851,9 +846,13 @@ describe('TokenAccess', function() {
   })
 
   describe('unimported v1 project', function() {
-    before(() => (settings.overleaf = { host: 'http://localhost:5000' }))
+    before(function() {
+      return (settings.overleaf = { host: 'http://localhost:5000' })
+    })
 
-    after(() => delete settings.overleaf)
+    after(function() {
+      return delete settings.overleaf
+    })
 
     it('should show error page for read and write token', function(done) {
       const unimportedV1Token = '123abc'
@@ -955,7 +954,9 @@ describe('TokenAccess', function() {
     })
 
     describe('when importing check not configured', function() {
-      before(() => delete settings.projectImportingCheckMaxCreateDelta)
+      before(function() {
+        return delete settings.projectImportingCheckMaxCreateDelta
+      })
 
       it('should load editor', function(done) {
         return try_read_and_write_token_access(

services/web/test/acceptance/src/TpdsUpdateTests.js

@@ -49,7 +49,7 @@ describe('TpdsUpdateTests', function() {
             sendImmediately: true
           }
         },
-        function(error, response, body) {
+        (error, response, body) => {
           if (error != null) {
             throw error
           }
@@ -60,10 +60,7 @@ describe('TpdsUpdateTests', function() {
     })
 
     it('should have deleted the file', function(done) {
-      return ProjectGetter.getProject(this.project_id, function(
-        error,
-        project
-      ) {
+      return ProjectGetter.getProject(this.project_id, (error, project) => {
         if (error != null) {
           throw error
         }

services/web/test/acceptance/src/UserEmailsTests.js

@@ -52,7 +52,7 @@ describe('UserEmails', function() {
           cb => {
             return this.user.request(
               { url: '/user/emails', json: true },
-              function(error, response, body) {
+              (error, response, body) => {
                 expect(response.statusCode).to.equal(200)
                 expect(body[0].confirmedAt).to.not.exist
                 expect(body[1].confirmedAt).to.not.exist
@@ -100,7 +100,7 @@ describe('UserEmails', function() {
           cb => {
             return this.user.request(
               { url: '/user/emails', json: true },
-              function(error, response, body) {
+              (error, response, body) => {
                 expect(response.statusCode).to.equal(200)
                 expect(body[0].confirmedAt).to.not.exist
                 expect(body[1].confirmedAt).to.exist
@@ -243,7 +243,7 @@ describe('UserEmails', function() {
           cb => {
             return this.user2.request(
               { url: '/user/emails', json: true },
-              function(error, response, body) {
+              (error, response, body) => {
                 expect(response.statusCode).to.equal(200)
                 expect(body[0].confirmedAt).to.not.exist
                 expect(body[1].confirmedAt).to.exist
@@ -257,7 +257,7 @@ describe('UserEmails', function() {
     })
   })
 
-  describe('with an expired token', () =>
+  describe('with an expired token', function() {
     it('should not confirm the email', function(done) {
       let token = null
       return async.series(
@@ -331,7 +331,8 @@ describe('UserEmails', function() {
         ],
         done
       )
-    }))
+    })
+  })
 
   describe('resending the confirmation', function() {
     it('should generate a new token', function(done) {
@@ -570,7 +571,7 @@ describe('UserEmails', function() {
           cb => {
             return this.user.request(
               { url: '/user/emails', json: true },
-              function(error, response, body) {
+              (error, response, body) => {
                 expect(response.statusCode).to.equal(200)
                 expect(body[0].confirmedAt).to.not.exist
                 expect(body[0].default).to.equal(false)
@@ -641,7 +642,7 @@ describe('UserEmails', function() {
           cb => {
             return this.user.request(
               { url: '/user/emails', json: true },
-              function(error, response, body) {
+              (error, response, body) => {
                 expect(body[0].default).to.equal(true)
                 expect(body[1].default).to.equal(false)
                 return cb()
@@ -801,7 +802,7 @@ describe('UserEmails', function() {
           cb => {
             return this.user.request(
               { url: '/user/emails', json: true },
-              function(error, response, body) {
+              (error, response, body) => {
                 expect(body[0].default).to.equal(false)
                 expect(body[1].default).to.equal(true)
                 return cb()

services/web/test/acceptance/src/UserReconfirmTests.js

@@ -31,7 +31,7 @@ describe('User Must Reconfirm', function() {
   it('should not allow sign in', function(done) {
     return this.user.login(err => {
       expect(err != null).to.equal(false)
-      return this.user.isLoggedIn(function(err, isLoggedIn) {
+      return this.user.isLoggedIn((err, isLoggedIn) => {
         expect(isLoggedIn).to.equal(false)
         return done()
       })

services/web/test/acceptance/src/UserThirdPartyIdentityTests.js

@@ -76,7 +76,7 @@ describe('ThirdPartyIdentityManager', function() {
       })
     })
 
-    describe('when third party identity does not exists', () =>
+    describe('when third party identity does not exists', function() {
       it('should return error', function(done) {
         ThirdPartyIdentityManager.login(
           this.provider,
@@ -87,23 +87,25 @@ describe('ThirdPartyIdentityManager', function() {
             return done()
           }
         )
-      }))
+      })
+    })
   })
 
   describe('link', function() {
-    describe('when provider not already linked', () =>
+    describe('when provider not already linked', function() {
       it('should link provider to user', function(done) {
         ThirdPartyIdentityManager.link(
           this.user.id,
           this.provider,
           this.externalUserId,
           this.externalData,
-          function(err, res) {
+          (err, res) => {
             expect(res.thirdPartyIdentifiers.length).to.equal(1)
             return done()
           }
         )
-      }))
+      })
+    })
 
     describe('when provider is already linked', function() {
       beforeEach(function(done) {
@@ -122,7 +124,7 @@ describe('ThirdPartyIdentityManager', function() {
           this.provider,
           this.externalUserId,
           this.externalData,
-          function(err, res) {
+          (err, res) => {
             expect(res).to.exist
             done()
           }
@@ -135,7 +137,7 @@ describe('ThirdPartyIdentityManager', function() {
           this.provider,
           this.externalUserId,
           this.externalData,
-          function(err, user) {
+          (err, user) => {
             expect(user.thirdPartyIdentifiers.length).to.equal(1)
             return done()
           }
@@ -180,18 +182,19 @@ describe('ThirdPartyIdentityManager', function() {
   })
 
   describe('unlink', function() {
-    describe('when provider not already linked', () =>
+    describe('when provider not already linked', function() {
       it('should succeed', function(done) {
         return ThirdPartyIdentityManager.unlink(
           this.user.id,
           this.provider,
-          function(err, res) {
+          (err, res) => {
             expect(err).to.be.null
             expect(res.thirdPartyIdentifiers.length).to.equal(0)
             return done()
           }
         )
-      }))
+      })
+    })
 
     describe('when provider is already linked', function() {
       beforeEach(function(done) {

services/web/test/acceptance/src/helpers/MockClsiApi.js

@@ -47,20 +47,19 @@ module.exports = MockClsiApi = {
     app.post('/project/:project_id/compile', compile)
     app.post('/project/:project_id/user/:user_id/compile', compile)
 
-    app.get('/project/:project_id/build/:build_id/output/*', function(
-      req,
-      res,
-      next
-    ) {
-      const filename = req.params[0]
-      if (filename === 'project.pdf') {
-        return res.status(200).send('mock-pdf')
-      } else if (filename === 'project.log') {
-        return res.status(200).send('mock-log')
-      } else {
-        return res.sendStatus(404)
+    app.get(
+      '/project/:project_id/build/:build_id/output/*',
+      (req, res, next) => {
+        const filename = req.params[0]
+        if (filename === 'project.pdf') {
+          return res.status(200).send('mock-pdf')
+        } else if (filename === 'project.log') {
+          return res.status(200).send('mock-log')
+        } else {
+          return res.sendStatus(404)
+        }
       }
-    })
+    )
 
     app.get(
       '/project/:project_id/user/:user_id/build/:build_id/output/:output_path',
@@ -74,12 +73,12 @@ module.exports = MockClsiApi = {
     })
 
     return app
-      .listen(3013, function(error) {
+      .listen(3013, error => {
         if (error != null) {
           throw error
         }
       })
-      .on('error', function(error) {
+      .on('error', error => {
         console.error('error starting MockClsiApi:', error.message)
         return process.exit(1)
       })

services/web/test/acceptance/src/helpers/MockDocUpdaterApi.js

@@ -93,12 +93,12 @@ module.exports = MockDocUpdaterApi = {
     })
 
     return app
-      .listen(3003, function(error) {
+      .listen(3003, error => {
         if (error != null) {
           throw error
         }
       })
-      .on('error', function(error) {
+      .on('error', error => {
         console.error('error starting MockDocUpdaterApi:', error.message)
         return process.exit(1)
       })

services/web/test/acceptance/src/helpers/MockDocstoreApi.js

@@ -83,12 +83,12 @@ module.exports = MockDocStoreApi = {
     })
 
     return app
-      .listen(3016, function(error) {
+      .listen(3016, error => {
         if (error != null) {
           throw error
         }
       })
-      .on('error', function(error) {
+      .on('error', error => {
         console.error('error starting MockDocStoreApi:', error.message)
         return process.exit(1)
       })

services/web/test/acceptance/src/helpers/MockFileStoreApi.js

@@ -64,12 +64,12 @@ module.exports = MockFileStoreApi = {
     )
 
     return app
-      .listen(3009, function(error) {
+      .listen(3009, error => {
         if (error != null) {
           throw error
         }
       })
-      .on('error', function(error) {
+      .on('error', error => {
         console.error('error starting MockFileStoreApi:', error.message)
         return process.exit(1)
       })

services/web/test/acceptance/src/helpers/MockProjectHistoryApi.js

@@ -153,12 +153,12 @@ module.exports = MockProjectHistoryApi = {
     })
 
     return app
-      .listen(3054, function(error) {
+      .listen(3054, error => {
         if (error != null) {
           throw error
         }
       })
-      .on('error', function(error) {
+      .on('error', error => {
         console.error('error starting MockProjectHistoryApi:', error.message)
         return process.exit(1)
       })

services/web/test/acceptance/src/helpers/MockRecurlyApi.js

@@ -100,7 +100,7 @@ module.exports = MockRecurlyApi = {
 `)
     })
 
-    return app.listen(6034, function(error) {
+    return app.listen(6034, error => {
       if (error != null) {
         throw error
       }

services/web/test/acceptance/src/helpers/MockTagsApi.js

@@ -16,12 +16,12 @@ const MockTagsApi = {
     })
 
     app
-      .listen(3012, function(error) {
+      .listen(3012, error => {
         if (error) {
           throw error
         }
       })
-      .on('error', function(error) {
+      .on('error', error => {
         console.error('error starting MockTagsApi:', error.message)
         process.exit(1)
       })

services/web/test/acceptance/src/helpers/MockV1Api.js

@@ -260,12 +260,12 @@ module.exports = MockV1Api = {
     )
 
     return app
-      .listen(5000, function(error) {
+      .listen(5000, error => {
         if (error != null) {
           throw error
         }
       })
-      .on('error', function(error) {
+      .on('error', error => {
         console.error('error starting MockV1Api:', error.message)
         return process.exit(1)
       })

services/web/test/acceptance/src/helpers/MockV1HistoryApi.js

@@ -61,12 +61,12 @@ module.exports = MockV1HistoryApi = {
     )
 
     return app
-      .listen(3100, function(error) {
+      .listen(3100, error => {
         if (error != null) {
           throw error
         }
       })
-      .on('error', function(error) {
+      .on('error', error => {
         console.error('error starting MockV1HistoryApi:', error.message)
         return process.exit(1)
       })

services/web/test/acceptance/src/helpers/User.js

@@ -331,7 +331,7 @@ class User {
       return db.projects.remove(
         { owner_ref: ObjectId(user_id) },
         { multi: true },
-        function(err) {
+        err => {
           if (err != null) {
             callback(err)
           }
@@ -398,7 +398,7 @@ class User {
         url: '/project/new',
         json: Object.assign({ projectName: name }, options)
       },
-      function(error, response, body) {
+      (error, response, body) => {
         if (error != null) {
           return callback(error)
         }
@@ -425,7 +425,7 @@ class User {
       {
         url: `/project/${project_id}?forever=true`
       },
-      function(error, response, body) {
+      (error, response, body) => {
         if (error != null) {
           return callback(error)
         }
@@ -453,7 +453,7 @@ class User {
       {
         url: `/project/${project_id}`
       },
-      function(error, response, body) {
+      (error, response, body) => {
         if (error != null) {
           return callback(error)
         }
@@ -517,7 +517,7 @@ class User {
           publicAccessLevel: level
         }
       },
-      function(error, response, body) {
+      (error, response, body) => {
         if (error != null) {
           return callback(error)
         }
@@ -537,7 +537,7 @@ class User {
           publicAccessLevel: 'private'
         }
       },
-      function(error, response, body) {
+      (error, response, body) => {
         if (error != null) {
           return callback(error)
         }
@@ -557,7 +557,7 @@ class User {
           publicAccessLevel: 'tokenBased'
         }
       },
-      function(error, response, body) {
+      (error, response, body) => {
         if (error != null) {
           return callback(error)
         }
@@ -729,11 +729,7 @@ class User {
     if (callback == null) {
       callback = function(error, loggedIn) {}
     }
-    return this.request.get('/user/personal_info', function(
-      error,
-      response,
-      body
-    ) {
+    return this.request.get('/user/personal_info', (error, response, body) => {
       if (error != null) {
         return callback(error)
       }

services/web/test/acceptance/src/helpers/redis.js

@@ -36,7 +36,7 @@ module.exports = {
       callback = function(err) {}
     }
     const sessionSetKey = UserSessionsRedis.sessionSetKey(user)
-    return rclient.smembers(sessionSetKey, function(err, sessionKeys) {
+    return rclient.smembers(sessionSetKey, (err, sessionKeys) => {
       if (err) {
         return callback(err)
       }
@@ -45,7 +45,7 @@ module.exports = {
       }
       const actions = sessionKeys.map(k => cb => rclient.del(k, err => cb(err)))
       return Async.series(actions, (err, results) =>
-        rclient.srem(sessionSetKey, sessionKeys, function(err) {
+        rclient.srem(sessionSetKey, sessionKeys, err => {
           if (err) {
             return callback(err)
           }

services/web/test/smoke/src/SmokeTests.js

@@ -36,7 +36,7 @@ const RateLimiter = require('../../../app/src/infrastructure/RateLimiter.js')
 // Change cookie to be non secure so curl will send it
 const convertCookieFile = function(callback) {
   fs = require('fs')
-  return fs.readFile(cookeFilePath, 'utf8', function(err, data) {
+  return fs.readFile(cookeFilePath, 'utf8', (err, data) => {
     if (err) {
       return callback(err)
     }
@@ -44,7 +44,7 @@ const convertCookieFile = function(callback) {
     const secondTrue = data.indexOf('TRUE', firstTrue + 4)
     const result =
       data.slice(0, secondTrue) + 'FALSE' + data.slice(secondTrue + 4)
-    return fs.writeFile(cookeFilePath, result, 'utf8', function(err) {
+    return fs.writeFile(cookeFilePath, result, 'utf8', err => {
       if (err) {
         return callback(err)
       }
@@ -56,9 +56,7 @@ const convertCookieFile = function(callback) {
 describe('Opening', function() {
   before(function(done) {
     logger.log('smoke test: setup')
-    LoginRateLimiter.recordSuccessfulLogin(Settings.smokeTest.user, function(
-      err
-    ) {
+    LoginRateLimiter.recordSuccessfulLogin(Settings.smokeTest.user, err => {
       if (err != null) {
         logger.err({ err }, 'smoke test: error recoring successful login')
         return done(err)
@@ -66,7 +64,7 @@ describe('Opening', function() {
       return RateLimiter.clearRateLimit(
         'open-project',
         `${Settings.smokeTest.projectId}:${Settings.smokeTest.userId}`,
-        function(err) {
+        err => {
           if (err != null) {
             logger.err(
               { err },
@@ -77,7 +75,7 @@ describe('Opening', function() {
           return RateLimiter.clearRateLimit(
             'overleaf-login',
             Settings.smokeTest.rateLimitSubject,
-            function(err) {
+            err => {
               if (err != null) {
                 logger.err(
                   { err },
@@ -98,13 +96,13 @@ describe('Opening', function() {
     let command = `\
 curl -H  "X-Forwarded-Proto: https" -c ${cookeFilePath} ${buildUrl('dev/csrf')}\
 `
-    child.exec(command, function(err, stdout, stderr) {
+    child.exec(command, (err, stdout, stderr) => {
       if (err != null) {
         done(err)
       }
       const csrf = stdout
       logger.log('smoke test: converting cookie file 1')
-      return convertCookieFile(function(err) {
+      return convertCookieFile(err => {
         if (err != null) {
           return done(err)
         }
@@ -114,7 +112,7 @@ curl -c ${cookeFilePath} -H "Content-Type: application/json" -H "X-Forwarded-Pro
           Settings.smokeTest.user
         }", "password":"${Settings.smokeTest.password}"}' ${buildUrl('login')}\
 `
-        return child.exec(command, function(err) {
+        return child.exec(command, err => {
           if (err != null) {
             return done(err)
           }
@@ -127,7 +125,7 @@ curl -c ${cookeFilePath} -H "Content-Type: application/json" -H "X-Forwarded-Pro
 
   after(function(done) {
     logger.log('smoke test: converting cookie file 2')
-    convertCookieFile(function(err) {
+    convertCookieFile(err => {
       if (err != null) {
         return done(err)
       }
@@ -135,13 +133,13 @@ curl -c ${cookeFilePath} -H "Content-Type: application/json" -H "X-Forwarded-Pro
       let command = `\
 curl -H  "X-Forwarded-Proto: https" -c ${cookeFilePath} ${buildUrl('dev/csrf')}\
 `
-      return child.exec(command, function(err, stdout, stderr) {
+      return child.exec(command, (err, stdout, stderr) => {
         if (err != null) {
           done(err)
         }
         const csrf = stdout
         logger.log('smoke test: converting cookie file 3')
-        return convertCookieFile(function(err) {
+        return convertCookieFile(err => {
           if (err != null) {
             return done(err)
           }
@@ -150,7 +148,7 @@ curl -H "Content-Type: application/json" -H "X-Forwarded-Proto: https" -d '{"_cs
             'logout'
           )}\
 `
-          return child.exec(command, function(err, stdout, stderr) {
+          return child.exec(command, (err, stdout, stderr) => {
             if (err != null) {
               return done(err)
             }
@@ -169,7 +167,7 @@ curl -H "X-Forwarded-Proto: https" -v ${buildUrl(
       `project/${Settings.smokeTest.projectId}`
     )}\
 `
-    return child.exec(command, function(error, stdout, stderr) {
+    return child.exec(command, (error, stdout, stderr) => {
       expect(error, 'smoke test: error in getting project').to.not.exist
 
       const statusCodeMatch = !!stderr.match('200 OK')
@@ -196,11 +194,9 @@ curl -H "X-Forwarded-Proto: https" -v ${buildUrl(
     const command = `\
 curl -H "X-Forwarded-Proto: https" -v ${buildUrl('project')}\
 `
-    return child.exec(command, function(error, stdout, stderr) {
-      expect(
-        error,
-        'smoke test: error returned in getting project list'
-      ).to.not.exist
+    return child.exec(command, (error, stdout, stderr) => {
+      expect(error, 'smoke test: error returned in getting project list').to.not
+        .exist
       expect(
         !!stderr.match('200 OK'),
         'smoke test: response code is not 200 getting project list'

services/web/test/unit/src/Authentication/AuthenticationControllerTests.js

@@ -98,7 +98,9 @@ describe('AuthenticationController', function() {
     this.next = sinon.stub()
   })
 
-  afterEach(() => tk.reset())
+  afterEach(function() {
+    return tk.reset()
+  })
 
   describe('isUserLoggedIn', function() {
     beforeEach(function() {
@@ -1007,7 +1009,7 @@ describe('AuthenticationController', function() {
     })
   })
 
-  describe('_getSafeRedirectPath', () =>
+  describe('_getSafeRedirectPath', function() {
     it('sanitize redirect path to prevent open redirects', function() {
       expect(
         this.AuthenticationController._getSafeRedirectPath('https://evil.com')
@@ -1030,7 +1032,8 @@ describe('AuthenticationController', function() {
       return expect(
         this.AuthenticationController._getSafeRedirectPath('.evil.com')
       ).to.equal('/.evil.com')
-    }))
+    })
+  })
 
   describe('_clearRedirectFromSession', function() {
     beforeEach(function() {

services/web/test/unit/src/Authentication/AuthenticationManagerTests.js

@@ -308,13 +308,14 @@ describe('AuthenticationManager', function() {
   })
 
   describe('validateEmail', function() {
-    describe('valid', () =>
+    describe('valid', function() {
       it('should return null', function() {
         const result = this.AuthenticationManager.validateEmail(
           'foo@example.com'
         )
         return expect(result).to.equal(null)
-      }))
+      })
+    })
 
     describe('invalid', function() {
       it('should return validation error object for no email', function() {
@@ -338,12 +339,13 @@ describe('AuthenticationManager', function() {
         '0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef012345678')
     })
 
-    describe('with a null password', () =>
+    describe('with a null password', function() {
       it('should return an error', function() {
         return expect(this.AuthenticationManager.validatePassword()).to.eql({
           message: 'password not set'
         })
-      }))
+      })
+    })
 
     describe('password length', function() {
       describe('with the default password length options', function() {
@@ -519,7 +521,7 @@ describe('AuthenticationManager', function() {
         return this.AuthenticationManager.setUserPassword(
           this.user_id,
           this.password,
-          function(err) {
+          err => {
             expect(err).to.exist
             return done()
           }
@@ -554,7 +556,7 @@ describe('AuthenticationManager', function() {
         return this.AuthenticationManager.setUserPassword(
           this.user_id,
           this.password,
-          function(err) {
+          err => {
             expect(err).to.exist
             return done()
           }

services/web/test/unit/src/Authorization/AuthorizationManagerTests.js

@@ -562,7 +562,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canRead) {
+          (error, canRead) => {
             expect(canRead).to.equal(true)
             return done()
           }
@@ -582,7 +582,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canRead) {
+          (error, canRead) => {
             expect(canRead).to.equal(true)
             return done()
           }
@@ -602,7 +602,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canRead) {
+          (error, canRead) => {
             expect(canRead).to.equal(true)
             return done()
           }
@@ -622,7 +622,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canRead) {
+          (error, canRead) => {
             expect(canRead).to.equal(false)
             return done()
           }
@@ -648,7 +648,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canWrite) {
+          (error, canWrite) => {
             expect(canWrite).to.equal(true)
             return done()
           }
@@ -668,7 +668,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canWrite) {
+          (error, canWrite) => {
             expect(canWrite).to.equal(true)
             return done()
           }
@@ -688,7 +688,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canWrite) {
+          (error, canWrite) => {
             expect(canWrite).to.equal(false)
             return done()
           }
@@ -708,7 +708,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canWrite) {
+          (error, canWrite) => {
             expect(canWrite).to.equal(false)
             return done()
           }
@@ -734,7 +734,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canWrite) {
+          (error, canWrite) => {
             expect(canWrite).to.equal(true)
             return done()
           }
@@ -754,7 +754,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canWrite) {
+          (error, canWrite) => {
             expect(canWrite).to.equal(true)
             return done()
           }
@@ -774,7 +774,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canWrite) {
+          (error, canWrite) => {
             expect(canWrite).to.equal(false)
             return done()
           }
@@ -794,7 +794,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canWrite) {
+          (error, canWrite) => {
             expect(canWrite).to.equal(false)
             return done()
           }
@@ -814,7 +814,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canWrite) {
+          (error, canWrite) => {
             expect(canWrite).to.equal(false)
             return done()
           }
@@ -840,7 +840,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canAdmin) {
+          (error, canAdmin) => {
             expect(canAdmin).to.equal(true)
             return done()
           }
@@ -860,7 +860,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canAdmin) {
+          (error, canAdmin) => {
             expect(canAdmin).to.equal(false)
             return done()
           }
@@ -880,7 +880,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canAdmin) {
+          (error, canAdmin) => {
             expect(canAdmin).to.equal(false)
             return done()
           }
@@ -900,7 +900,7 @@ describe('AuthorizationManager', function() {
           this.user_id,
           this.project_id,
           this.token,
-          function(error, canAdmin) {
+          (error, canAdmin) => {
             expect(canAdmin).to.equal(false)
             return done()
           }
@@ -922,13 +922,13 @@ describe('AuthorizationManager', function() {
       })
 
       it('should return true', function(done) {
-        return this.AuthorizationManager.isUserSiteAdmin(this.user_id, function(
-          error,
-          isAdmin
-        ) {
-          expect(isAdmin).to.equal(true)
-          return done()
-        })
+        return this.AuthorizationManager.isUserSiteAdmin(
+          this.user_id,
+          (error, isAdmin) => {
+            expect(isAdmin).to.equal(true)
+            return done()
+          }
+        )
       })
     })
 
@@ -940,13 +940,13 @@ describe('AuthorizationManager', function() {
       })
 
       it('should return false', function(done) {
-        return this.AuthorizationManager.isUserSiteAdmin(this.user_id, function(
-          error,
-          isAdmin
-        ) {
-          expect(isAdmin).to.equal(false)
-          return done()
-        })
+        return this.AuthorizationManager.isUserSiteAdmin(
+          this.user_id,
+          (error, isAdmin) => {
+            expect(isAdmin).to.equal(false)
+            return done()
+          }
+        )
       })
     })
 
@@ -958,17 +958,17 @@ describe('AuthorizationManager', function() {
       })
 
       it('should return false', function(done) {
-        return this.AuthorizationManager.isUserSiteAdmin(this.user_id, function(
-          error,
-          isAdmin
-        ) {
-          expect(isAdmin).to.equal(false)
-          return done()
-        })
+        return this.AuthorizationManager.isUserSiteAdmin(
+          this.user_id,
+          (error, isAdmin) => {
+            expect(isAdmin).to.equal(false)
+            return done()
+          }
+        )
       })
     })
 
-    describe('when no user is passed', () =>
+    describe('when no user is passed', function() {
       it('should return false', function(done) {
         return this.AuthorizationManager.isUserSiteAdmin(
           null,
@@ -978,6 +978,7 @@ describe('AuthorizationManager', function() {
             return done()
           }
         )
-      }))
+      })
+    })
   })
 })

services/web/test/unit/src/Authorization/AuthorizationMiddlewareTests.js

@@ -231,7 +231,7 @@ describe('AuthorizationMiddleware', function() {
             return this.AuthorizationMiddleware[middlewareMethod](
               this.req,
               this.res,
-              function(error) {
+              error => {
                 error.should.be.instanceof(Errors.NotFoundError)
                 return done()
               }
@@ -392,7 +392,7 @@ describe('AuthorizationMiddleware', function() {
       })
     })
 
-    describe('with anonymous user', () =>
+    describe('with anonymous user', function() {
       describe('when user has permission', function() {
         describe('when user has permission to access all projects', function() {
           beforeEach(function() {
@@ -438,6 +438,7 @@ describe('AuthorizationMiddleware', function() {
               .should.equal(true)
           })
         })
-      }))
+      })
+    })
   })
 })

services/web/test/unit/src/Blog/BlogControllerTests.js

@@ -93,7 +93,7 @@ describe('BlogController', function() {
     })
   })
 
-  describe('getIndexPage', () =>
+  describe('getIndexPage', function() {
     it('should change the url and send it to getPage', function(done) {
       this.req.url = '/blog'
       this.BlogController.getPage = function(req, res) {
@@ -101,5 +101,6 @@ describe('BlogController', function() {
         return done()
       }
       return this.BlogController.getIndexPage(this.req, this.res)
-    }))
+    })
+  })
 })

services/web/test/unit/src/Chat/ChatControllerTests.js

@@ -178,7 +178,7 @@ describe('ChatController', function() {
             ]
           }
         },
-        function(error, threads) {
+        (error, threads) => {
           expect(threads).to.deep.equal({
             thread1: {
               resolved: true,

services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js

@@ -123,7 +123,7 @@ describe('CollaboratorsHandler', function() {
       it('should return a NotFoundError', function(done) {
         return this.CollaboratorHandler.getMemberIdsWithPrivilegeLevels(
           this.project_id,
-          function(error) {
+          error => {
             error.should.be.instanceof(Errors.NotFoundError)
             return done()
           }
@@ -383,7 +383,7 @@ describe('CollaboratorsHandler', function() {
       return this.CollaboratorHandler.getMemberIdPrivilegeLevel(
         'member-id-2',
         this.project_id,
-        function(error, level) {
+        (error, level) => {
           expect(level).to.equal('readOnly')
           return done()
         }
@@ -394,7 +394,7 @@ describe('CollaboratorsHandler', function() {
       return this.CollaboratorHandler.getMemberIdPrivilegeLevel(
         'member-id-3',
         this.project_id,
-        function(error, level) {
+        (error, level) => {
           expect(level).to.equal(false)
           return done()
         }

services/web/test/unit/src/Compile/ClsiCookieManagerTests.js

@@ -299,13 +299,13 @@ describe('ClsiCookieManager', function() {
         },
         requires: this.requires
       })()
-      return this.ClsiCookieManager.getCookieJar(this.project_id, function(
-        err,
-        jar
-      ) {
-        assert.deepEqual(jar, realRequst.jar())
-        return done()
-      })
+      return this.ClsiCookieManager.getCookieJar(
+        this.project_id,
+        (err, jar) => {
+          assert.deepEqual(jar, realRequst.jar())
+          return done()
+        }
+      )
     })
   })
 })

services/web/test/unit/src/Compile/ClsiFormatCheckerTests.js

@@ -154,7 +154,7 @@ describe('ClsiFormatChecker', function() {
 
         return this.ClsiFormatChecker._checkForConflictingPaths(
           this.resources,
-          function(err, conflictPathErrors) {
+          (err, conflictPathErrors) => {
             conflictPathErrors.length.should.equal(1)
             conflictPathErrors[0].path.should.equal('stuff/image')
             return done()
@@ -170,7 +170,7 @@ describe('ClsiFormatChecker', function() {
 
         return this.ClsiFormatChecker._checkForConflictingPaths(
           this.resources,
-          function(err, conflictPathErrors) {
+          (err, conflictPathErrors) => {
             conflictPathErrors.length.should.equal(1)
             conflictPathErrors[0].path.should.equal('stuff')
             return done()
@@ -186,7 +186,7 @@ describe('ClsiFormatChecker', function() {
 
         return this.ClsiFormatChecker._checkForConflictingPaths(
           this.resources,
-          function(err, conflictPathErrors) {
+          (err, conflictPathErrors) => {
             conflictPathErrors.length.should.equal(0)
             return done()
           }
@@ -212,7 +212,7 @@ describe('ClsiFormatChecker', function() {
 
         return this.ClsiFormatChecker._checkDocsAreUnderSizeLimit(
           this.resources,
-          function(err, sizeError) {
+          (err, sizeError) => {
             sizeError.totalSize.should.equal(10000016)
             sizeError.resources.length.should.equal(10)
             sizeError.resources[0].path.should.equal('massive.tex')
@@ -239,7 +239,7 @@ describe('ClsiFormatChecker', function() {
 
         return this.ClsiFormatChecker._checkDocsAreUnderSizeLimit(
           this.resources,
-          function(err, sizeError) {
+          (err, sizeError) => {
             expect(sizeError).to.not.exist
             return done()
           }

services/web/test/unit/src/Compile/ClsiManagerTests.js

@@ -784,7 +784,7 @@ describe('ClsiManager', function() {
       })
     })
 
-    describe('with the draft option', () =>
+    describe('with the draft option', function() {
       it('should add the draft option into the request', function(done) {
         return this.ClsiManager._buildRequest(
           this.project_id,
@@ -794,7 +794,8 @@ describe('ClsiManager', function() {
             return done()
           }
         )
-      }))
+      })
+    })
   })
 
   describe('_postToClsi', function() {

services/web/test/unit/src/Compile/CompileControllerTests.js

@@ -478,7 +478,7 @@ describe('CompileController', function() {
         })
       })
 
-      describe('user with priority compile', () =>
+      describe('user with priority compile', function() {
         beforeEach(function() {
           this.CompileManager.getProjectCompileLimits = sinon
             .stub()
@@ -490,7 +490,8 @@ describe('CompileController', function() {
             this.res,
             this.next
           )
-        }))
+        })
+      })
 
       describe('user with standard priority via query string', function() {
         beforeEach(function() {

services/web/test/unit/src/Compile/CompileManagerTests.js

@@ -154,7 +154,7 @@ describe('CompileManager', function() {
       })
     })
 
-    describe('when the project has been recently compiled', () =>
+    describe('when the project has been recently compiled', function() {
       it('should return', function(done) {
         this.CompileManager._checkIfAutoCompileLimitHasBeenHit = (
           isAutoCompile,
@@ -168,14 +168,15 @@ describe('CompileManager', function() {
           this.project_id,
           this.user_id,
           {},
-          function(err, status) {
+          (err, status) => {
             status.should.equal('too-recently-compiled')
             return done()
           }
         )
-      }))
+      })
+    })
 
-    describe('should check the rate limit', () =>
+    describe('should check the rate limit', function() {
       it('should return', function(done) {
         this.CompileManager._checkIfAutoCompileLimitHasBeenHit = sinon
           .stub()
@@ -184,12 +185,13 @@ describe('CompileManager', function() {
           this.project_id,
           this.user_id,
           {},
-          function(err, status) {
+          (err, status) => {
             status.should.equal('autocompile-backoff')
             return done()
           }
         )
-      }))
+      })
+    })
   })
 
   describe('getProjectCompileLimits', function() {

services/web/test/unit/src/Cooldown/CooldownManagerTests.js

@@ -35,12 +35,13 @@ describe('CooldownManager', function() {
     }))
   })
 
-  describe('_buildKey', () =>
+  describe('_buildKey', function() {
     it('should build a properly formatted redis key', function() {
       return expect(this.CooldownManager._buildKey('ABC')).to.equal(
         'Cooldown:{ABC}'
       )
-    }))
+    })
+  })
 
   describe('isProjectOnCooldown', function() {
     beforeEach(function() {

services/web/test/unit/src/DocumentUpdater/DocumentUpdaterHandlerTests.js

@@ -812,7 +812,7 @@ describe('DocumentUpdaterHandler', function() {
         return this.request.callsArgWith(1, null, { statusCode: 204 }, '')
       })
 
-      describe('when an entity has changed name', () =>
+      describe('when an entity has changed name', function() {
         it('should send the structure update to the document updater', function(done) {
           this.docIdA = new ObjectId()
           this.docIdB = new ObjectId()
@@ -865,9 +865,10 @@ describe('DocumentUpdaterHandler', function() {
               return done()
             }
           )
-        }))
+        })
+      })
 
-      describe('when a doc has been added', () =>
+      describe('when a doc has been added', function() {
         it('should send the structure update to the document updater', function(done) {
           this.docId = new ObjectId()
           this.changes = {
@@ -909,9 +910,10 @@ describe('DocumentUpdaterHandler', function() {
               return done()
             }
           )
-        }))
+        })
+      })
 
-      describe('when a file has been added', () =>
+      describe('when a file has been added', function() {
         it('should send the structure update to the document updater', function(done) {
           this.fileId = new ObjectId()
           this.changes = {
@@ -957,9 +959,10 @@ describe('DocumentUpdaterHandler', function() {
               return done()
             }
           )
-        }))
+        })
+      })
 
-      describe('when an entity has been deleted', () =>
+      describe('when an entity has been deleted', function() {
         it('should end the structure update to the document updater', function(done) {
           this.docId = new ObjectId()
           this.changes = {
@@ -999,9 +1002,10 @@ describe('DocumentUpdaterHandler', function() {
               return done()
             }
           )
-        }))
+        })
+      })
 
-      describe('when the project version is missing', () =>
+      describe('when the project version is missing', function() {
         it('should call the callback with an error', function() {
           this.docId = new ObjectId()
           this.changes = {
@@ -1031,7 +1035,8 @@ describe('DocumentUpdaterHandler', function() {
           return firstCallArgs[0].message.should.equal(
             'did not receive project version in changes'
           )
-        }))
+        })
+      })
     })
   })
 })

services/web/test/unit/src/Downloads/ProjectZipStreamManagerTests.js

@@ -49,7 +49,7 @@ describe('ProjectZipStreamManager', function() {
     }))
   })
 
-  describe('createZipStreamForMultipleProjects', () =>
+  describe('createZipStreamForMultipleProjects', function() {
     describe('successfully', function() {
       beforeEach(function(done) {
         this.project_ids = ['project-1', 'project-2']
@@ -128,7 +128,8 @@ describe('ProjectZipStreamManager', function() {
             .should.equal(true)
         )
       })
-    }))
+    })
+  })
 
   describe('createZipStreamForProject', function() {
     describe('successfully', function() {

services/web/test/unit/src/Editor/EditorControllerTests.js

@@ -637,7 +637,7 @@ describe('EditorController', function() {
     })
   })
 
-  describe('notifyUsersProjectHasBeenDeletedOrRenamed', () =>
+  describe('notifyUsersProjectHasBeenDeletedOrRenamed', function() {
     it('should emmit a message to all users in a project', function(done) {
       return this.EditorController.notifyUsersProjectHasBeenDeletedOrRenamed(
         this.project_id,
@@ -651,7 +651,8 @@ describe('EditorController', function() {
           return done()
         }
       )
-    }))
+    })
+  })
 
   describe('updateProjectDescription', function() {
     beforeEach(function() {

services/web/test/unit/src/Email/SpamSafeTests.js

@@ -17,7 +17,7 @@ const modulePath = path.join(
 const SpamSafe = require(modulePath)
 const { expect } = require('chai')
 
-describe('SpamSafe', () =>
+describe('SpamSafe', function() {
   it('should reject spammy names', function() {
     expect(SpamSafe.isSafeUserName('Charline Wałęsa')).to.equal(true)
     expect(
@@ -83,4 +83,5 @@ describe('SpamSafe', () =>
     return expect(
       SpamSafe.safeEmail('sendME$$$@iAmAprince.com', 'A collaborator')
     ).to.equal('A collaborator')
-  }))
+  })
+})

services/web/test/unit/src/Errors/HttpErrorControllerTests.js

@@ -7,8 +7,8 @@ const MockRequest = require('../helpers/MockRequest')
 const Errors = require('../../../../app/src/Features/Errors/Errors')
 const HttpErrors = require('@overleaf/o-error/http')
 
-describe('HttpErrorController', () => {
-  beforeEach(() => {
+describe('HttpErrorController', function() {
+  beforeEach(function() {
     this.req = new MockRequest()
     this.res = new MockResponse()
 
@@ -33,10 +33,10 @@ describe('HttpErrorController', () => {
     })
   })
 
-  describe('handleError', () => {
-    beforeEach(() => {})
+  describe('handleError', function() {
+    beforeEach(function() {})
 
-    it('logs and return status code', () => {
+    it('logs and return status code', function() {
       let error = new HttpErrors.UnprocessableEntityError()
 
       this.ErrorController.handleError(error, this.req, this.res)
@@ -49,7 +49,7 @@ describe('HttpErrorController', () => {
       expect(url).to.not.be.defined
     })
 
-    it('logs url method and userId', () => {
+    it('logs url method and userId', function() {
       let error = new HttpErrors.UnprocessableEntityError()
       this.AuthenticationController.getLoggedInUserId.returns('123abc')
       this.req.url = 'overleaf.url'
@@ -63,7 +63,7 @@ describe('HttpErrorController', () => {
       expect(url).to.equal('overleaf.url')
     })
 
-    it('logs and return status code when wrapped', () => {
+    it('logs and return status code when wrapped', function() {
       let cause = new Errors.SubscriptionAdminDeletionError()
       let error = new HttpErrors.UnprocessableEntityError({}).withCause(cause)
 
@@ -72,7 +72,7 @@ describe('HttpErrorController', () => {
       sinon.assert.calledOnce(this.logger.warn)
     })
 
-    it('renders JSON with info', () => {
+    it('renders JSON with info', function() {
       let cause = new Errors.SubscriptionAdminDeletionError({
         info: {
           public: { some: 'data' }
@@ -92,7 +92,7 @@ describe('HttpErrorController', () => {
       )
     })
 
-    it('renders HTML with info', () => {
+    it('renders HTML with info', function() {
       let cause = new Errors.SubscriptionAdminDeletionError()
       let error = new HttpErrors.UnprocessableEntityError({}).withCause(cause)
       this.req.accepts = () => 'html'

services/web/test/unit/src/Exports/ExportsControllerTests.js

@@ -79,7 +79,7 @@ describe('ExportsController', function() {
     }))
   })
 
-  describe('without gallery fields', () =>
+  describe('without gallery fields', function() {
     it('should ask the handler to perform the export', function(done) {
       this.handler.exportProject = sinon
         .stub()
@@ -98,7 +98,8 @@ describe('ExportsController', function() {
           return done()
         }
       })
-    }))
+    })
+  })
 
   describe('with gallery fields', function() {
     beforeEach(function() {
@@ -135,7 +136,7 @@ describe('ExportsController', function() {
     })
   })
 
-  describe('with an error return from v1 to forward to the publish modal', () =>
+  describe('with an error return from v1 to forward to the publish modal', function() {
     it('should forward the response onward', function(done) {
       this.error_json = { status: 422, message: 'nope' }
       this.handler.exportProject = sinon
@@ -145,7 +146,8 @@ describe('ExportsController', function() {
       expect(this.res.json.args[0][0]).to.deep.equal(this.error_json)
       expect(this.res.status.args[0][0]).to.equal(this.error_json.status)
       return done()
-    }))
+    })
+  })
 
   it('should ask the handler to return the status of an export', function(done) {
     this.handler.fetchExport = sinon.stub().yields(

services/web/test/unit/src/Exports/ExportsHandlerTests.js

@@ -327,7 +327,7 @@ describe('ExportsHandler', function() {
       })
     })
 
-    describe('when project has no root doc', () =>
+    describe('when project has no root doc', function() {
       describe('when a root doc can be set automatically', function() {
         beforeEach(function(done) {
           this.project.rootDoc_id = null
@@ -386,7 +386,8 @@ describe('ExportsHandler', function() {
             .calledWith(null, expected_export_data)
             .should.equal(true)
         })
-      }))
+      })
+    })
 
     describe('when project has an invalid root doc', function() {
       describe('when a new root doc can be set automatically', function() {

services/web/test/unit/src/History/RestoreManagerTests.js

@@ -49,7 +49,9 @@ describe('RestoreManager', function() {
     return (this.callback = sinon.stub())
   })
 
-  afterEach(() => tk.reset())
+  afterEach(function() {
+    return tk.reset()
+  })
 
   describe('restoreFileFromV2', function() {
     beforeEach(function() {

services/web/test/unit/src/Institutions/InstitutionsAPITests.js

@@ -93,7 +93,7 @@ describe('InstitutionsAPI', function() {
     })
   })
 
-  describe('getInstitutionLicences', () =>
+  describe('getInstitutionLicences', function() {
     it('get licences', function(done) {
       this.institutionId = 123
       const responseBody = {
@@ -124,7 +124,8 @@ describe('InstitutionsAPI', function() {
           return done()
         }
       )
-    }))
+    })
+  })
 
   describe('getUserAffiliations', function() {
     it('get affiliations', function(done) {

services/web/test/unit/src/Institutions/InstitutionsFeaturesTests.js

@@ -48,13 +48,13 @@ describe('InstitutionsFeatures', function() {
   describe('hasLicence', function() {
     it('should handle error', function(done) {
       this.InstitutionsGetter.getConfirmedInstitutions.yields(new Error('Nope'))
-      return this.InstitutionsFeatures.hasLicence(this.userId, function(
-        error,
-        hasLicence
-      ) {
-        expect(error).to.exist
-        return done()
-      })
+      return this.InstitutionsFeatures.hasLicence(
+        this.userId,
+        (error, hasLicence) => {
+          expect(error).to.exist
+          return done()
+        }
+      )
     })
 
     it('should return false if user has no confirmed affiliations', function(done) {
@@ -63,14 +63,14 @@ describe('InstitutionsFeatures', function() {
         null,
         institutions
       )
-      return this.InstitutionsFeatures.hasLicence(this.userId, function(
-        error,
-        hasLicence
-      ) {
-        expect(error).to.not.exist
-        expect(hasLicence).to.be.false
-        return done()
-      })
+      return this.InstitutionsFeatures.hasLicence(
+        this.userId,
+        (error, hasLicence) => {
+          expect(error).to.not.exist
+          expect(hasLicence).to.be.false
+          return done()
+        }
+      )
     })
 
     it('should return false if user has no paid affiliations', function(done) {
@@ -79,14 +79,14 @@ describe('InstitutionsFeatures', function() {
         null,
         institutions
       )
-      return this.InstitutionsFeatures.hasLicence(this.userId, function(
-        error,
-        hasLicence
-      ) {
-        expect(error).to.not.exist
-        expect(hasLicence).to.be.false
-        return done()
-      })
+      return this.InstitutionsFeatures.hasLicence(
+        this.userId,
+        (error, hasLicence) => {
+          expect(error).to.not.exist
+          expect(hasLicence).to.be.false
+          return done()
+        }
+      )
     })
 
     it('should return true if user has confirmed paid affiliation', function(done) {
@@ -100,14 +100,14 @@ describe('InstitutionsFeatures', function() {
         null,
         institutions
       )
-      return this.InstitutionsFeatures.hasLicence(this.userId, function(
-        error,
-        hasLicence
-      ) {
-        expect(error).to.not.exist
-        expect(hasLicence).to.be.true
-        return done()
-      })
+      return this.InstitutionsFeatures.hasLicence(
+        this.userId,
+        (error, hasLicence) => {
+          expect(error).to.not.exist
+          expect(hasLicence).to.be.true
+          return done()
+        }
+      )
     })
   })
 
@@ -124,7 +124,7 @@ describe('InstitutionsFeatures', function() {
       this.InstitutionsFeatures.getInstitutionsPlan.yields(new Error('Nope'))
       return this.InstitutionsFeatures.getInstitutionsFeatures(
         this.userId,
-        function(error, features) {
+        (error, features) => {
           expect(error).to.exist
           return done()
         }
@@ -135,7 +135,7 @@ describe('InstitutionsFeatures', function() {
       this.InstitutionsFeatures.getInstitutionsPlan.yields(null, null)
       return this.InstitutionsFeatures.getInstitutionsFeatures(
         this.userId,
-        function(error, features) {
+        (error, features) => {
           expect(error).to.not.exist
           expect(features).to.deep.equal({})
           return done()
@@ -168,7 +168,7 @@ describe('InstitutionsFeatures', function() {
       this.InstitutionsFeatures.hasLicence.yields(new Error('Nope'))
       return this.InstitutionsFeatures.getInstitutionsPlan(
         this.userId,
-        function(error) {
+        error => {
           expect(error).to.exist
           return done()
         }
@@ -179,7 +179,7 @@ describe('InstitutionsFeatures', function() {
       this.InstitutionsFeatures.hasLicence.yields(null, false)
       return this.InstitutionsFeatures.getInstitutionsPlan(
         this.userId,
-        function(error, plan) {
+        (error, plan) => {
           expect(error).to.not.exist
           expect(plan).to.equal(null)
           return done()

services/web/test/unit/src/Institutions/InstitutionsGetterTests.js

@@ -62,7 +62,7 @@ describe('InstitutionsGetter', function() {
       this.UserGetter.getUserFullEmails.yields(null, this.userEmails)
       return this.InstitutionsGetter.getConfirmedInstitutions(
         this.userId,
-        function(error, institutions) {
+        (error, institutions) => {
           expect(error).to.not.exist
           institutions.length.should.equal(1)
           institutions[0].id.should.equal(456)
@@ -75,7 +75,7 @@ describe('InstitutionsGetter', function() {
       this.UserGetter.getUserFullEmails.yields(null, [])
       return this.InstitutionsGetter.getConfirmedInstitutions(
         this.userId,
-        function(error, institutions) {
+        (error, institutions) => {
           expect(error).to.not.exist
           institutions.length.should.equal(0)
           return done()
@@ -87,7 +87,7 @@ describe('InstitutionsGetter', function() {
       this.UserGetter.getUserFullEmails.yields(new Error('Nope'))
       return this.InstitutionsGetter.getConfirmedInstitutions(
         this.userId,
-        function(error, institutions) {
+        (error, institutions) => {
           expect(error).to.exist
           return done()
         }

services/web/test/unit/src/Institutions/InstitutionsManagerTests.js

@@ -157,7 +157,7 @@ describe('InstitutionsManager', function() {
     })
   })
 
-  describe('checkInstitutionUsers', () =>
+  describe('checkInstitutionUsers', function() {
     it('check all users Features', function(done) {
       const affiliations = [{ email: 'foo@bar.com' }, { email: 'baz@boo.edu' }]
       const stubbedUsers = [
@@ -190,9 +190,10 @@ describe('InstitutionsManager', function() {
           return done()
         }
       )
-    }))
+    })
+  })
 
-  describe('getInstitutionUsersSubscriptions', () =>
+  describe('getInstitutionUsersSubscriptions', function() {
     it('returns all institution users subscriptions', function(done) {
       const stubbedUsers = [
         { user_id: '123abc123abc123abc123abc' },
@@ -208,5 +209,6 @@ describe('InstitutionsManager', function() {
           return done()
         }
       )
-    }))
+    })
+  })
 })

services/web/test/unit/src/PasswordReset/PasswordResetControllerTests.js

@@ -365,7 +365,7 @@ describe('PasswordResetController', function() {
         })
       })
 
-      describe('without a token in session', () =>
+      describe('without a token in session', function() {
         it('should redirect to the reset request page', function(done) {
           this.res.redirect = path => {
             path.should.equal('/user/password/reset')
@@ -376,7 +376,8 @@ describe('PasswordResetController', function() {
             this.req,
             this.res
           )
-        }))
+        })
+      })
     })
   })
 })

services/web/test/unit/src/Project/ProjectControllerTests.js

@@ -264,7 +264,7 @@ describe('ProjectController', function() {
     })
   })
 
-  describe('updateProjectAdminSettings', () =>
+  describe('updateProjectAdminSettings', function() {
     it('should update the public access level', function(done) {
       this.EditorController.setPublicAccessLevel = sinon.stub().callsArg(2)
       this.req.body = {
@@ -281,7 +281,8 @@ describe('ProjectController', function() {
         this.req,
         this.res
       )
-    }))
+    })
+  })
 
   describe('deleteProject', function() {
     it('should tell the project deleter to archive when forever=false', function(done) {
@@ -311,7 +312,7 @@ describe('ProjectController', function() {
     })
   })
 
-  describe('restoreProject', () =>
+  describe('restoreProject', function() {
     it('should tell the project deleter', function(done) {
       this.res.sendStatus = code => {
         this.ProjectDeleter.restoreProject
@@ -321,9 +322,10 @@ describe('ProjectController', function() {
         return done()
       }
       return this.ProjectController.restoreProject(this.req, this.res)
-    }))
+    })
+  })
 
-  describe('cloneProject', () =>
+  describe('cloneProject', function() {
     it('should call the project duplicator', function(done) {
       this.res.send = json => {
         this.ProjectDuplicator.duplicate
@@ -333,7 +335,8 @@ describe('ProjectController', function() {
         return done()
       }
       return this.ProjectController.cloneProject(this.req, this.res)
-    }))
+    })
+  })
 
   describe('newProject', function() {
     it('should call the projectCreationHandler with createExampleProject', function(done) {
@@ -580,7 +583,7 @@ describe('ProjectController', function() {
               this.tokenReadOnly.length +
               this.V1Response.projects.length
           )
-          opts.projects.forEach(function(p) {
+          opts.projects.forEach(p => {
             // Check properties correctly mapped from V1
             expect(p).to.have.property('id')
             expect(p).to.have.property('name')
@@ -598,7 +601,7 @@ describe('ProjectController', function() {
           opts.tags.length.should.equal(
             this.tags.length + this.V1Response.tags.length
           )
-          opts.tags.forEach(function(t) {
+          opts.tags.forEach(t => {
             expect(t).to.have.property('name')
             return expect(t).to.have.property('project_ids')
           })

services/web/test/unit/src/Project/ProjectCreationHandlerTests.js

@@ -130,14 +130,15 @@ describe('ProjectCreationHandler', function() {
       })
 
       it('should return the project in the callback', function(done) {
-        return this.handler.createBlankProject(ownerId, projectName, function(
-          err,
-          project
-        ) {
-          project.name.should.equal(projectName)
-          ;(project.owner_ref + '').should.equal(ownerId)
-          return done()
-        })
+        return this.handler.createBlankProject(
+          ownerId,
+          projectName,
+          (err, project) => {
+            project.name.should.equal(projectName)
+            ;(project.owner_ref + '').should.equal(ownerId)
+            return done()
+          }
+        )
       })
 
       it('should initialize the project overleaf if history id not provided', function(done) {
@@ -171,7 +172,7 @@ describe('ProjectCreationHandler', function() {
           ownerId,
           projectName,
           attributes,
-          function(err, project) {
+          (err, project) => {
             project.overleaf.history.id.should.equal(overleaf_id)
             return done()
           }
@@ -179,13 +180,14 @@ describe('ProjectCreationHandler', function() {
       })
 
       it('should set the language from the user', function(done) {
-        return this.handler.createBlankProject(ownerId, projectName, function(
-          err,
-          project
-        ) {
-          project.spellCheckLanguage.should.equal('de')
-          return done()
-        })
+        return this.handler.createBlankProject(
+          ownerId,
+          projectName,
+          (err, project) => {
+            project.spellCheckLanguage.should.equal('de')
+            return done()
+          }
+        )
       })
 
       it('should set the imageName to currentImageName if set and no imageName attribute', function(done) {

services/web/test/unit/src/Project/ProjectDeleterTests.js

@@ -9,8 +9,8 @@ const { Project } = require('../helpers/models/Project')
 const { DeletedProject } = require('../helpers/models/DeletedProject')
 const { ObjectId } = require('mongoose').Types
 
-describe('ProjectDeleter', () => {
-  beforeEach(() => {
+describe('ProjectDeleter', function() {
+  beforeEach(function() {
     tk.freeze(Date.now())
     this.project_id = ObjectId('588fffffffffffffffffffff')
     this.ip = '192.170.18.1'
@@ -143,14 +143,14 @@ describe('ProjectDeleter', () => {
     })
   })
 
-  afterEach(() => {
+  afterEach(function() {
     tk.reset()
     this.DeletedProjectMock.restore()
     this.ProjectMock.restore()
   })
 
-  describe('mark as deleted by external source', () => {
-    beforeEach(() => {
+  describe('mark as deleted by external source', function() {
+    beforeEach(function() {
       this.ProjectMock.expects('update')
         .withArgs(
           { _id: this.project_id },
@@ -159,14 +159,14 @@ describe('ProjectDeleter', () => {
         .yields()
     })
 
-    it('should update the project with the flag set to true', done => {
+    it('should update the project with the flag set to true', function(done) {
       this.ProjectDeleter.markAsDeletedByExternalSource(this.project_id, () => {
         this.ProjectMock.verify()
         done()
       })
     })
 
-    it('should tell the editor controler so users are notified', done => {
+    it('should tell the editor controler so users are notified', function(done) {
       this.ProjectDeleter.markAsDeletedByExternalSource(this.project_id, () => {
         this.editorController.notifyUsersProjectHasBeenDeletedOrRenamed
           .calledWith(this.project_id)
@@ -176,8 +176,8 @@ describe('ProjectDeleter', () => {
     })
   })
 
-  describe('unmarkAsDeletedByExternalSource', done => {
-    beforeEach(() => {
+  describe('unmarkAsDeletedByExternalSource', function(done) {
+    beforeEach(function() {
       this.ProjectMock.expects('update')
         .withArgs(
           { _id: this.project_id },
@@ -187,13 +187,13 @@ describe('ProjectDeleter', () => {
       this.ProjectDeleter.unmarkAsDeletedByExternalSource(this.project_id, done)
     })
 
-    it('should remove the flag from the project', () => {
+    it('should remove the flag from the project', function() {
       this.ProjectMock.verify()
     })
   })
 
-  describe('deleteUsersProjects', () => {
-    beforeEach(() => {
+  describe('deleteUsersProjects', function() {
+    beforeEach(function() {
       this.ProjectMock.expects('find')
         .withArgs({ owner_ref: this.user._id })
         .yields(null, [{ _id: 'wombat' }, { _id: 'potato' }])
@@ -201,14 +201,14 @@ describe('ProjectDeleter', () => {
       this.ProjectDeleter.deleteProject = sinon.stub().yields()
     })
 
-    it('should find all the projects owned by the user_id', done => {
+    it('should find all the projects owned by the user_id', function(done) {
       this.ProjectDeleter.deleteUsersProjects(this.user._id, () => {
         this.ProjectMock.verify()
         done()
       })
     })
 
-    it('should call deleteProject once for each project', done => {
+    it('should call deleteProject once for each project', function(done) {
       this.ProjectDeleter.deleteUsersProjects(this.user._id, () => {
         sinon.assert.calledTwice(this.ProjectDeleter.deleteProject)
         sinon.assert.calledWith(this.ProjectDeleter.deleteProject, 'wombat')
@@ -217,7 +217,7 @@ describe('ProjectDeleter', () => {
       })
     })
 
-    it('should remove all the projects the user is a collaborator of', done => {
+    it('should remove all the projects the user is a collaborator of', function(done) {
       this.ProjectDeleter.deleteUsersProjects(this.user._id, () => {
         sinon.assert.calledWith(
           this.CollaboratorsHandler.removeUserFromAllProjets,
@@ -231,8 +231,8 @@ describe('ProjectDeleter', () => {
     })
   })
 
-  describe('deleteProject', () => {
-    beforeEach(() => {
+  describe('deleteProject', function() {
+    beforeEach(function() {
       this.deleterData = {
         deletedAt: new Date(),
         deletedProjectId: this.project._id,
@@ -256,7 +256,7 @@ describe('ProjectDeleter', () => {
         .resolves(this.project)
     })
 
-    it('should save a DeletedProject with additional deleterData', done => {
+    it('should save a DeletedProject with additional deleterData', function(done) {
       this.deleterData.deleterIpAddress = this.ip
       this.deleterData.deleterId = this.user._id
 
@@ -281,7 +281,7 @@ describe('ProjectDeleter', () => {
       )
     })
 
-    it('should flushProjectToMongoAndDelete in doc updater', done => {
+    it('should flushProjectToMongoAndDelete in doc updater', function(done) {
       this.ProjectMock.expects('remove')
         .chain('exec')
         .resolves()
@@ -299,7 +299,7 @@ describe('ProjectDeleter', () => {
       )
     })
 
-    it('should removeProjectFromAllTags', done => {
+    it('should removeProjectFromAllTags', function(done) {
       this.ProjectMock.expects('remove')
         .chain('exec')
         .resolves()
@@ -320,7 +320,7 @@ describe('ProjectDeleter', () => {
       })
     })
 
-    it('should remove the project from Mongo', done => {
+    it('should remove the project from Mongo', function(done) {
       this.ProjectMock.expects('remove')
         .withArgs({ _id: this.project_id })
         .chain('exec')
@@ -334,8 +334,8 @@ describe('ProjectDeleter', () => {
     })
   })
 
-  describe('expireDeletedProjectsAfterDuration', () => {
-    beforeEach(done => {
+  describe('expireDeletedProjectsAfterDuration', function() {
+    beforeEach(function(done) {
       this.ProjectDeleter.expireDeletedProject = sinon
         .stub()
         .callsArgWith(1, null)
@@ -354,11 +354,11 @@ describe('ProjectDeleter', () => {
       this.ProjectDeleter.expireDeletedProjectsAfterDuration(done)
     })
 
-    it('should call find with a date 90 days earlier than today', () => {
+    it('should call find with a date 90 days earlier than today', function() {
       this.DeletedProjectMock.verify()
     })
 
-    it('should call expireDeletedProject', done => {
+    it('should call expireDeletedProject', function(done) {
       expect(this.ProjectDeleter.expireDeletedProject).to.have.been.calledWith(
         this.deletedProjects[0].deleterData.deletedProjectId
       )
@@ -366,8 +366,8 @@ describe('ProjectDeleter', () => {
     })
   })
 
-  describe('expireDeletedProject', () => {
-    beforeEach(done => {
+  describe('expireDeletedProject', function() {
+    beforeEach(function(done) {
       this.DeletedProjectMock.expects('update')
         .withArgs(
           {
@@ -396,19 +396,19 @@ describe('ProjectDeleter', () => {
       )
     })
 
-    it('should find the specified deletedProject and remove its project and ip address', () => {
+    it('should find the specified deletedProject and remove its project and ip address', function() {
       this.DeletedProjectMock.verify()
     })
 
-    it('should destroy the docs in docstore', () => {
+    it('should destroy the docs in docstore', function() {
       expect(this.DocstoreManager.destroyProject).to.have.been.calledWith(
         this.deletedProjects[0].project._id
       )
     })
   })
 
-  describe('archiveProject', () => {
-    beforeEach(() => {
+  describe('archiveProject', function() {
+    beforeEach(function() {
       this.ProjectMock.expects('update')
         .withArgs(
           {
@@ -421,7 +421,7 @@ describe('ProjectDeleter', () => {
         .yields()
     })
 
-    it('should update the project', done => {
+    it('should update the project', function(done) {
       this.ProjectDeleter.archiveProject(this.project_id, () => {
         this.ProjectMock.verify()
         done()
@@ -429,8 +429,8 @@ describe('ProjectDeleter', () => {
     })
   })
 
-  describe('restoreProject', () => {
-    beforeEach(() => {
+  describe('restoreProject', function() {
+    beforeEach(function() {
       this.ProjectMock.expects('update')
         .withArgs(
           {
@@ -443,7 +443,7 @@ describe('ProjectDeleter', () => {
         .yields()
     })
 
-    it('should unset the archive attribute', done => {
+    it('should unset the archive attribute', function(done) {
       this.ProjectDeleter.restoreProject(this.project_id, () => {
         this.ProjectMock.verify()
         done()
@@ -451,8 +451,8 @@ describe('ProjectDeleter', () => {
     })
   })
 
-  describe('undeleteProject', () => {
-    beforeEach(() => {
+  describe('undeleteProject', function() {
+    beforeEach(function() {
       this.deletedProject = {
         _id: 'deleted',
         project: this.project,
@@ -486,7 +486,7 @@ describe('ProjectDeleter', () => {
         .resolves()
     })
 
-    it('should return not found if the project does not exist', done => {
+    it('should return not found if the project does not exist', function(done) {
       this.ProjectDeleter.undeleteProject('wombat', err => {
         expect(err).to.exist
         expect(err.name).to.equal('NotFoundError')
@@ -495,7 +495,7 @@ describe('ProjectDeleter', () => {
       })
     })
 
-    it('should return not found if the project has been expired', done => {
+    it('should return not found if the project has been expired', function(done) {
       this.ProjectDeleter.undeleteProject('purgedProject', err => {
         expect(err.name).to.equal('NotFoundError')
         expect(err.message).to.equal('project_too_old_to_restore')
@@ -503,7 +503,7 @@ describe('ProjectDeleter', () => {
       })
     })
 
-    it('should insert the project into the collection', done => {
+    it('should insert the project into the collection', function(done) {
       this.ProjectDeleter.undeleteProject(this.project._id, err => {
         expect(err).not.to.exist
         sinon.assert.calledWith(
@@ -517,27 +517,7 @@ describe('ProjectDeleter', () => {
       })
     })
 
-    it('should remove the DeletedProject', done => {
-      // need to change the mock just to include the methods we want
-      this.DeletedProjectMock.restore()
-      this.DeletedProjectMock = sinon.mock(DeletedProject)
-      this.DeletedProjectMock.expects('findOne')
-        .withArgs({ 'deleterData.deletedProjectId': this.project._id })
-        .chain('exec')
-        .resolves(this.deletedProject)
-      this.DeletedProjectMock.expects('deleteOne')
-        .withArgs({ _id: 'deleted' })
-        .chain('exec')
-        .resolves()
-
-      this.ProjectDeleter.undeleteProject(this.project._id, err => {
-        expect(err).not.to.exist
-        this.DeletedProjectMock.verify()
-        done()
-      })
-    })
-
-    it('should clear the archive bit', done => {
+    it('should clear the archive bit', function(done) {
       this.project.archived = true
       this.ProjectDeleter.undeleteProject(this.project._id, err => {
         expect(err).not.to.exist
@@ -549,7 +529,7 @@ describe('ProjectDeleter', () => {
       })
     })
 
-    it('should generate a unique name for the project', done => {
+    it('should generate a unique name for the project', function(done) {
       this.ProjectDeleter.undeleteProject(this.project._id, err => {
         expect(err).not.to.exist
         sinon.assert.calledWith(
@@ -560,7 +540,7 @@ describe('ProjectDeleter', () => {
       })
     })
 
-    it('should add a suffix to the project name', done => {
+    it('should add a suffix to the project name', function(done) {
       this.ProjectDeleter.undeleteProject(this.project._id, err => {
         expect(err).not.to.exist
         sinon.assert.calledWith(
@@ -571,5 +551,25 @@ describe('ProjectDeleter', () => {
         done()
       })
     })
+
+    it('should remove the DeletedProject', function(done) {
+      // need to change the mock just to include the methods we want
+      this.DeletedProjectMock.restore()
+      this.DeletedProjectMock = sinon.mock(DeletedProject)
+      this.DeletedProjectMock.expects('findOne')
+        .withArgs({ 'deleterData.deletedProjectId': this.project._id })
+        .chain('exec')
+        .resolves(this.deletedProject)
+      this.DeletedProjectMock.expects('deleteOne')
+        .withArgs({ _id: 'deleted' })
+        .chain('exec')
+        .resolves()
+
+      this.ProjectDeleter.undeleteProject(this.project._id, err => {
+        expect(err).not.to.exist
+        this.DeletedProjectMock.verify()
+        done()
+      })
+    })
   })
 })

services/web/test/unit/src/Project/ProjectDetailsHandlerTests.js

@@ -138,7 +138,7 @@ describe('ProjectDetailsHandler', function() {
 
     it("should return a not found error if the project can't be found", function(done) {
       this.ProjectGetter.getProject.callsArgWith(2)
-      return this.handler.transferOwnership('abc', '123', function(err) {
+      return this.handler.transferOwnership('abc', '123', err => {
         err.should.exist
         err.name.should.equal('NotFoundError')
         return done()
@@ -147,7 +147,7 @@ describe('ProjectDetailsHandler', function() {
 
     it("should return a not found error if the user can't be found", function(done) {
       this.ProjectGetter.getProject.callsArgWith(2)
-      return this.handler.transferOwnership('abc', '123', function(err) {
+      return this.handler.transferOwnership('abc', '123', err => {
         err.should.exist
         err.name.should.equal('NotFoundError')
         return done()
@@ -160,7 +160,7 @@ describe('ProjectDetailsHandler', function() {
         2,
         errorMessage
       )
-      return this.handler.transferOwnership('abc', '123', function(err) {
+      return this.handler.transferOwnership('abc', '123', err => {
         err.should.exist
         err.should.equal(errorMessage)
         return done()
@@ -318,28 +318,28 @@ describe('ProjectDetailsHandler', function() {
 
   describe('validateProjectName', function() {
     it('should reject undefined names', function(done) {
-      return this.handler.validateProjectName(undefined, function(error) {
+      return this.handler.validateProjectName(undefined, error => {
         expect(error).to.exist
         return done()
       })
     })
 
     it('should reject empty names', function(done) {
-      return this.handler.validateProjectName('', function(error) {
+      return this.handler.validateProjectName('', error => {
         expect(error).to.exist
         return done()
       })
     })
 
     it('should reject names with /s', function(done) {
-      return this.handler.validateProjectName('foo/bar', function(error) {
+      return this.handler.validateProjectName('foo/bar', error => {
         expect(error).to.exist
         return done()
       })
     })
 
     it('should reject names with \\s', function(done) {
-      return this.handler.validateProjectName('foo\\bar', function(error) {
+      return this.handler.validateProjectName('foo\\bar', error => {
         expect(error).to.exist
         return done()
       })
@@ -348,7 +348,7 @@ describe('ProjectDetailsHandler', function() {
     it('should reject long names', function(done) {
       return this.handler.validateProjectName(
         new Array(1000).join('a'),
-        function(error) {
+        error => {
           expect(error).to.exist
           return done()
         }
@@ -356,7 +356,7 @@ describe('ProjectDetailsHandler', function() {
     })
 
     it('should accept normal names', function(done) {
-      return this.handler.validateProjectName('foobar', function(error) {
+      return this.handler.validateProjectName('foobar', error => {
         expect(error).to.not.exist
         return done()
       })
@@ -420,7 +420,7 @@ describe('ProjectDetailsHandler', function() {
         this.user_id,
         'unique-name',
         ['-test-suffix'],
-        function(error, name, changed) {
+        (error, name, changed) => {
           expect(name).to.equal('unique-name')
           expect(changed).to.equal(false)
           return done()
@@ -433,7 +433,7 @@ describe('ProjectDetailsHandler', function() {
         this.user_id,
         'name1',
         ['-test-suffix'],
-        function(error, name, changed) {
+        (error, name, changed) => {
           expect(name).to.equal('name1-test-suffix')
           expect(changed).to.equal(true)
           return done()
@@ -446,7 +446,7 @@ describe('ProjectDetailsHandler', function() {
         this.user_id,
         'name1',
         ['1', '-test-suffix'],
-        function(error, name, changed) {
+        (error, name, changed) => {
           expect(name).to.equal('name1-test-suffix')
           expect(changed).to.equal(true)
           return done()
@@ -460,7 +460,7 @@ describe('ProjectDetailsHandler', function() {
         this.user_id,
         'x'.repeat(15),
         ['-test-suffix'],
-        function(error, name, changed) {
+        (error, name, changed) => {
           expect(name).to.equal('x'.repeat(8) + '-test-suffix')
           expect(changed).to.equal(true)
           return done()
@@ -473,7 +473,7 @@ describe('ProjectDetailsHandler', function() {
         this.user_id,
         'name1',
         [],
-        function(error, name, changed) {
+        (error, name, changed) => {
           expect(name).to.equal('name1 (1)')
           expect(changed).to.equal(true)
           return done()
@@ -486,7 +486,7 @@ describe('ProjectDetailsHandler', function() {
         this.user_id,
         'name',
         ['1', '11'],
-        function(error, name, changed) {
+        (error, name, changed) => {
           expect(name).to.equal('name (1)')
           expect(changed).to.equal(true)
           return done()
@@ -499,7 +499,7 @@ describe('ProjectDetailsHandler', function() {
         this.user_id,
         'numeric',
         [],
-        function(error, name, changed) {
+        (error, name, changed) => {
           expect(name).to.equal('numeric (21)')
           expect(changed).to.equal(true)
           return done()
@@ -512,7 +512,7 @@ describe('ProjectDetailsHandler', function() {
         this.user_id,
         'numeric (5)',
         [],
-        function(error, name, changed) {
+        (error, name, changed) => {
           expect(name).to.equal('numeric (21)')
           expect(changed).to.equal(true)
           return done()
@@ -525,7 +525,7 @@ describe('ProjectDetailsHandler', function() {
         this.user_id,
         'numeric (31)',
         [],
-        function(error, name, changed) {
+        (error, name, changed) => {
           expect(name).to.equal('numeric (41)')
           expect(changed).to.equal(true)
           return done()

services/web/test/unit/src/Project/ProjectEntityMongoUpdateHandlerTests.js

@@ -82,7 +82,9 @@ describe('ProjectEntityMongoUpdateHandler', function() {
     }))
   })
 
-  afterEach(() => tk.reset())
+  afterEach(function() {
+    return tk.reset()
+  })
 
   describe('addDoc', function() {
     beforeEach(function() {

services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js

@@ -492,7 +492,7 @@ describe('ProjectEntityUpdateHandler', function() {
     })
   })
 
-  describe('setRootDoc', () =>
+  describe('setRootDoc', function() {
     it('should call Project.update', function() {
       const rootDoc_id = 'root-doc-id-123123'
       this.ProjectModel.update = sinon.stub()
@@ -500,16 +500,18 @@ describe('ProjectEntityUpdateHandler', function() {
       return this.ProjectModel.update
         .calledWith({ _id: project_id }, { rootDoc_id })
         .should.equal(true)
-    }))
+    })
+  })
 
-  describe('unsetRootDoc', () =>
+  describe('unsetRootDoc', function() {
     it('should call Project.update', function() {
       this.ProjectModel.update = sinon.stub()
       this.ProjectEntityUpdateHandler.unsetRootDoc(project_id)
       return this.ProjectModel.update
         .calledWith({ _id: project_id }, { $unset: { rootDoc_id: true } })
         .should.equal(true)
-    }))
+    })
+  })
 
   describe('addDoc', function() {
     describe('adding a doc', function() {

services/web/test/unit/src/Project/ProjectLocatorTests.js

@@ -86,7 +86,7 @@ describe('ProjectLocator', function() {
     it('finds one at the root level', function(done) {
       return this.locator.findElement(
         { project_id: project._id, element_id: doc2._id, type: 'docs' },
-        function(err, foundElement, path, parentFolder) {
+        (err, foundElement, path, parentFolder) => {
           assert(err == null)
           foundElement._id.should.equal(doc2._id)
           path.fileSystem.should.equal(`/${doc2.name}`)
@@ -100,7 +100,7 @@ describe('ProjectLocator', function() {
     it('when it is nested', function(done) {
       return this.locator.findElement(
         { project_id: project._id, element_id: subSubDoc._id, type: 'doc' },
-        function(err, foundElement, path, parentFolder) {
+        (err, foundElement, path, parentFolder) => {
           assert(err == null)
           should.equal(foundElement._id, subSubDoc._id)
           path.fileSystem.should.equal(
@@ -116,7 +116,7 @@ describe('ProjectLocator', function() {
     it('should give error if element could not be found', function(done) {
       return this.locator.findElement(
         { project_id: project._id, element_id: 'ddsd432nj42', type: 'docs' },
-        function(err, foundElement, path, parentFolder) {
+        (err, foundElement, path, parentFolder) => {
           err.should.deep.equal(new Errors.NotFoundError('entity not found'))
           return done()
         }
@@ -128,7 +128,7 @@ describe('ProjectLocator', function() {
     it('should return root folder when looking for root folder', function(done) {
       return this.locator.findElement(
         { project_id: project._id, element_id: rootFolder._id, type: 'folder' },
-        function(err, foundElement, path, parentFolder) {
+        (err, foundElement, path, parentFolder) => {
           assert(!err)
           foundElement._id.should.equal(rootFolder._id)
           return done()
@@ -139,7 +139,7 @@ describe('ProjectLocator', function() {
     it('when at root', function(done) {
       return this.locator.findElement(
         { project_id: project._id, element_id: subFolder._id, type: 'folder' },
-        function(err, foundElement, path, parentFolder) {
+        (err, foundElement, path, parentFolder) => {
           assert(!err)
           foundElement._id.should.equal(subFolder._id)
           path.fileSystem.should.equal(`/${subFolder.name}`)
@@ -157,7 +157,7 @@ describe('ProjectLocator', function() {
           element_id: secondSubFolder._id,
           type: 'folder'
         },
-        function(err, foundElement, path, parentFolder) {
+        (err, foundElement, path, parentFolder) => {
           assert(!err)
           foundElement._id.should.equal(secondSubFolder._id)
           path.fileSystem.should.equal(
@@ -175,7 +175,7 @@ describe('ProjectLocator', function() {
     it('when at root', function(done) {
       return this.locator.findElement(
         { project_id: project._id, element_id: file1._id, type: 'fileRefs' },
-        function(err, foundElement, path, parentFolder) {
+        (err, foundElement, path, parentFolder) => {
           assert(!err)
           foundElement._id.should.equal(file1._id)
           path.fileSystem.should.equal(`/${file1.name}`)
@@ -193,7 +193,7 @@ describe('ProjectLocator', function() {
           element_id: subSubFile._id,
           type: 'fileRefs'
         },
-        function(err, foundElement, path, parentFolder) {
+        (err, foundElement, path, parentFolder) => {
           assert(!err)
           foundElement._id.should.equal(subSubFile._id)
           path.fileSystem.should.equal(
@@ -211,7 +211,7 @@ describe('ProjectLocator', function() {
     it('should add an s onto the element type', function(done) {
       return this.locator.findElement(
         { project_id: project._id, element_id: subSubDoc._id, type: 'doc' },
-        function(err, foundElement, path, parentFolder) {
+        (err, foundElement, path, parentFolder) => {
           assert(!err)
           foundElement._id.should.equal(subSubDoc._id)
           return done()
@@ -222,7 +222,7 @@ describe('ProjectLocator', function() {
     it('should convert file to fileRefs', function(done) {
       return this.locator.findElement(
         { project_id: project._id, element_id: file1._id, type: 'fileRefs' },
-        function(err, foundElement, path, parentFolder) {
+        (err, foundElement, path, parentFolder) => {
           assert(!err)
           foundElement._id.should.equal(file1._id)
           return done()
@@ -247,7 +247,7 @@ describe('ProjectLocator', function() {
     it('should find doc in project', function(done) {
       return this.locator.findElement(
         { project: project2, element_id: doc3._id, type: 'docs' },
-        function(err, foundElement, path, parentFolder) {
+        (err, foundElement, path, parentFolder) => {
           assert(err == null)
           foundElement._id.should.equal(doc3._id)
           path.fileSystem.should.equal(`/${doc3.name}`)
@@ -261,7 +261,7 @@ describe('ProjectLocator', function() {
 
   describe('finding root doc', function() {
     it('should return root doc when passed project', function(done) {
-      return this.locator.findRootDoc(project, function(err, doc) {
+      return this.locator.findRootDoc(project, (err, doc) => {
         assert(err == null)
         doc._id.should.equal(rootDoc._id)
         return done()
@@ -269,7 +269,7 @@ describe('ProjectLocator', function() {
     })
 
     it('should return root doc when passed project_id', function(done) {
-      return this.locator.findRootDoc(project._id, function(err, doc) {
+      return this.locator.findRootDoc(project._id, (err, doc) => {
         assert(err == null)
         doc._id.should.equal(rootDoc._id)
         return done()
@@ -278,7 +278,7 @@ describe('ProjectLocator', function() {
 
     it('should return null when the project has no rootDoc', function(done) {
       project.rootDoc_id = null
-      return this.locator.findRootDoc(project, function(err, doc) {
+      return this.locator.findRootDoc(project, (err, doc) => {
         assert(err == null)
         expect(doc).to.equal(null)
         return done()
@@ -287,7 +287,7 @@ describe('ProjectLocator', function() {
 
     it('should return null when the rootDoc_id no longer exists', function(done) {
       project.rootDoc_id = 'doesntexist'
-      return this.locator.findRootDoc(project, function(err, doc) {
+      return this.locator.findRootDoc(project, (err, doc) => {
         assert(err == null)
         expect(doc).to.equal(null)
         return done()
@@ -298,136 +298,126 @@ describe('ProjectLocator', function() {
   describe('findElementByPath', function() {
     it('should take a doc path and return the element for a root level document', function(done) {
       const path = `${doc1.name}`
-      return this.locator.findElementByPath({ project, path }, function(
-        err,
-        element,
-        type
-      ) {
-        element.should.deep.equal(doc1)
-        expect(type).to.equal('doc')
-        return done()
-      })
+      return this.locator.findElementByPath(
+        { project, path },
+        (err, element, type) => {
+          element.should.deep.equal(doc1)
+          expect(type).to.equal('doc')
+          return done()
+        }
+      )
     })
 
     it('should take a doc path and return the element for a root level document with a starting slash', function(done) {
       const path = `/${doc1.name}`
-      return this.locator.findElementByPath({ project, path }, function(
-        err,
-        element,
-        type
-      ) {
-        element.should.deep.equal(doc1)
-        expect(type).to.equal('doc')
-        return done()
-      })
+      return this.locator.findElementByPath(
+        { project, path },
+        (err, element, type) => {
+          element.should.deep.equal(doc1)
+          expect(type).to.equal('doc')
+          return done()
+        }
+      )
     })
 
     it('should take a doc path and return the element for a nested document', function(done) {
       const path = `${subFolder.name}/${secondSubFolder.name}/${subSubDoc.name}`
-      return this.locator.findElementByPath({ project, path }, function(
-        err,
-        element,
-        type
-      ) {
-        element.should.deep.equal(subSubDoc)
-        expect(type).to.equal('doc')
-        return done()
-      })
+      return this.locator.findElementByPath(
+        { project, path },
+        (err, element, type) => {
+          element.should.deep.equal(subSubDoc)
+          expect(type).to.equal('doc')
+          return done()
+        }
+      )
     })
 
     it('should take a file path and return the element for a root level document', function(done) {
       const path = `${file1.name}`
-      return this.locator.findElementByPath({ project, path }, function(
-        err,
-        element,
-        type
-      ) {
-        element.should.deep.equal(file1)
-        expect(type).to.equal('file')
-        return done()
-      })
+      return this.locator.findElementByPath(
+        { project, path },
+        (err, element, type) => {
+          element.should.deep.equal(file1)
+          expect(type).to.equal('file')
+          return done()
+        }
+      )
     })
 
     it('should take a file path and return the element for a nested document', function(done) {
       const path = `${subFolder.name}/${secondSubFolder.name}/${
         subSubFile.name
       }`
-      return this.locator.findElementByPath({ project, path }, function(
-        err,
-        element,
-        type
-      ) {
-        element.should.deep.equal(subSubFile)
-        expect(type).to.equal('file')
-        return done()
-      })
+      return this.locator.findElementByPath(
+        { project, path },
+        (err, element, type) => {
+          element.should.deep.equal(subSubFile)
+          expect(type).to.equal('file')
+          return done()
+        }
+      )
     })
 
     it('should take a file path and return the element for a nested document case insenstive', function(done) {
       const path = `${subFolder.name.toUpperCase()}/${secondSubFolder.name.toUpperCase()}/${subSubFile.name.toUpperCase()}`
-      return this.locator.findElementByPath({ project, path }, function(
-        err,
-        element,
-        type
-      ) {
-        element.should.deep.equal(subSubFile)
-        expect(type).to.equal('file')
-        return done()
-      })
+      return this.locator.findElementByPath(
+        { project, path },
+        (err, element, type) => {
+          element.should.deep.equal(subSubFile)
+          expect(type).to.equal('file')
+          return done()
+        }
+      )
     })
 
     it('should take a file path and return the element for a nested folder', function(done) {
       const path = `${subFolder.name}/${secondSubFolder.name}`
-      return this.locator.findElementByPath({ project, path }, function(
-        err,
-        element,
-        type
-      ) {
-        element.should.deep.equal(secondSubFolder)
-        expect(type).to.equal('folder')
-        return done()
-      })
+      return this.locator.findElementByPath(
+        { project, path },
+        (err, element, type) => {
+          element.should.deep.equal(secondSubFolder)
+          expect(type).to.equal('folder')
+          return done()
+        }
+      )
     })
 
     it('should take a file path and return the root folder', function(done) {
       const path = '/'
-      return this.locator.findElementByPath({ project, path }, function(
-        err,
-        element,
-        type
-      ) {
-        element.should.deep.equal(rootFolder)
-        expect(type).to.equal('folder')
-        return done()
-      })
+      return this.locator.findElementByPath(
+        { project, path },
+        (err, element, type) => {
+          element.should.deep.equal(rootFolder)
+          expect(type).to.equal('folder')
+          return done()
+        }
+      )
     })
 
     it('should return an error if the file can not be found inside know folder', function(done) {
       const path = `${subFolder.name}/${secondSubFolder.name}/exist.txt`
-      return this.locator.findElementByPath({ project, path }, function(
-        err,
-        element,
-        type
-      ) {
-        err.should.not.equal(undefined)
-        assert.equal(element, undefined)
-        expect(type).to.be.undefined
-        return done()
-      })
+      return this.locator.findElementByPath(
+        { project, path },
+        (err, element, type) => {
+          err.should.not.equal(undefined)
+          assert.equal(element, undefined)
+          expect(type).to.be.undefined
+          return done()
+        }
+      )
     })
 
     it('should return an error if the file can not be found inside unknown folder', function(done) {
       const path = 'this/does/not/exist.txt'
-      return this.locator.findElementByPath({ project, path }, function(
-        err,
-        element,
-        type
-      ) {
-        err.should.not.equal(undefined)
-        assert.equal(element, undefined)
-        expect(type).to.be.undefined
-        return done()
-      })
+      return this.locator.findElementByPath(
+        { project, path },
+        (err, element, type) => {
+          err.should.not.equal(undefined)
+          assert.equal(element, undefined)
+          expect(type).to.be.undefined
+          return done()
+        }
+      )
     })
 
     describe('where duplicate folder exists', function() {
@@ -491,7 +481,7 @@ describe('ProjectLocator', function() {
         const path = '/other.tex'
         return this.locator.findElementByPath(
           { project: this.project, path },
-          function(err, element) {
+          (err, element) => {
             element.name.should.equal('other.tex')
             return done()
           }
@@ -508,7 +498,7 @@ describe('ProjectLocator', function() {
         const path = '/other.tex'
         return this.locator.findElementByPath(
           { project_id: project._id, path },
-          function(err, element) {
+          (err, element) => {
             expect(err).to.exist
             return done()
           }
@@ -516,7 +506,7 @@ describe('ProjectLocator', function() {
       })
     })
 
-    describe('with a project_id', () =>
+    describe('with a project_id', function() {
       it('should take a doc path and return the element for a root level document', function(done) {
         const path = `${doc1.name}`
         return this.locator.findElementByPath(
@@ -530,7 +520,8 @@ describe('ProjectLocator', function() {
             return done()
           }
         )
-      }))
+      })
+    })
   })
 
   describe('findUsersProjectByName finding a project by user_id and project name', function() {
@@ -551,7 +542,7 @@ describe('ProjectLocator', function() {
       return this.locator.findUsersProjectByName(
         user_id,
         stubbedProject.name.toLowerCase(),
-        function(err, project) {
+        (err, project) => {
           project.should.equal(stubbedProject)
           return done()
         }
@@ -577,7 +568,7 @@ describe('ProjectLocator', function() {
       return this.locator.findUsersProjectByName(
         user_id,
         stubbedProject.name.toLowerCase(),
-        function(err, project) {
+        (err, project) => {
           project._id.should.equal(stubbedProject._id)
           return done()
         }
@@ -597,7 +588,7 @@ describe('ProjectLocator', function() {
       return this.locator.findUsersProjectByName(
         user_id,
         stubbedProject.name.toLowerCase(),
-        function(err, project) {
+        (err, project) => {
           project.should.equal(stubbedProject)
           return done()
         }

services/web/test/unit/src/Project/ProjectOptionsHandlerTests.js

@@ -151,7 +151,7 @@ describe('ProjectOptionsHandler', function() {
     })
   })
 
-  describe('unsetting the brandVariationId', () =>
+  describe('unsetting the brandVariationId', function() {
     it('should perform and update on mongo', function(done) {
       this.handler.unsetBrandVariationId(project_id, err => {
         const args = this.projectModel.update.args[0]
@@ -160,5 +160,6 @@ describe('ProjectOptionsHandler', function() {
         return done()
       })
       return this.projectModel.update.args[0][3]()
-    }))
+    })
+  })
 })

services/web/test/unit/src/Project/ProjectUpdateHandlerTests.js

@@ -90,7 +90,7 @@ describe('ProjectUpdateHandler', function() {
     })
   })
 
-  describe('markAsOpened', () =>
+  describe('markAsOpened', function() {
     it('should send an update to mongo', function(done) {
       const project_id = 'project_id'
       return this.handler.markAsOpened(project_id, err => {
@@ -101,9 +101,10 @@ describe('ProjectUpdateHandler', function() {
         date.substring(0, 5).should.equal(now.substring(0, 5))
         return done()
       })
-    }))
+    })
+  })
 
-  describe('markAsInactive', () =>
+  describe('markAsInactive', function() {
     it('should send an update to mongo', function(done) {
       const project_id = 'project_id'
       return this.handler.markAsInactive(project_id, err => {
@@ -112,9 +113,10 @@ describe('ProjectUpdateHandler', function() {
         args[1].active.should.equal(false)
         return done()
       })
-    }))
+    })
+  })
 
-  describe('markAsActive', () =>
+  describe('markAsActive', function() {
     it('should send an update to mongo', function(done) {
       const project_id = 'project_id'
       return this.handler.markAsActive(project_id, err => {
@@ -123,5 +125,6 @@ describe('ProjectUpdateHandler', function() {
         args[1].active.should.equal(true)
         return done()
       })
-    }))
+    })
+  })
 })

services/web/test/unit/src/Publishers/PublishersGetterTests.js

@@ -60,14 +60,15 @@ describe('PublishersGetter', function() {
     return (this.userId = '12345abcde')
   })
 
-  describe('getManagedPublishers', () =>
+  describe('getManagedPublishers', function() {
     it('fetches v1 data before returning publisher list', function(done) {
-      return this.PublishersGetter.getManagedPublishers(this.userId, function(
-        error,
-        publishers
-      ) {
-        publishers.length.should.equal(1)
-        return done()
-      })
-    }))
+      return this.PublishersGetter.getManagedPublishers(
+        this.userId,
+        (error, publishers) => {
+          publishers.length.should.equal(1)
+          return done()
+        }
+      )
+    })
+  })
 })

services/web/test/unit/src/Referal/ReferalConnectTests.js

@@ -39,7 +39,7 @@ describe('Referal connect middle wear', function() {
       query: { referal: '12345' },
       session: {}
     }
-    return this.connect.use(req, {}, function() {
+    return this.connect.use(req, {}, () => {
       req.session.referal_id.should.equal(req.query.referal)
       return done()
     })
@@ -50,7 +50,7 @@ describe('Referal connect middle wear', function() {
       query: {},
       session: { referal_id: 'same' }
     }
-    return this.connect.use(req, {}, function() {
+    return this.connect.use(req, {}, () => {
       req.session.referal_id.should.equal('same')
       return done()
     })
@@ -61,7 +61,7 @@ describe('Referal connect middle wear', function() {
       query: { fb_ref: '12345' },
       session: {}
     }
-    return this.connect.use(req, {}, function() {
+    return this.connect.use(req, {}, () => {
       req.session.referal_id.should.equal(req.query.fb_ref)
       return done()
     })
@@ -72,7 +72,7 @@ describe('Referal connect middle wear', function() {
       query: { rm: 'fb' },
       session: {}
     }
-    return this.connect.use(req, {}, function() {
+    return this.connect.use(req, {}, () => {
       req.session.referal_medium.should.equal('facebook')
       return done()
     })
@@ -83,7 +83,7 @@ describe('Referal connect middle wear', function() {
       query: { rm: 't' },
       session: {}
     }
-    return this.connect.use(req, {}, function() {
+    return this.connect.use(req, {}, () => {
       req.session.referal_medium.should.equal('twitter')
       return done()
     })
@@ -94,7 +94,7 @@ describe('Referal connect middle wear', function() {
       query: { rm: 'gp' },
       session: {}
     }
-    return this.connect.use(req, {}, function() {
+    return this.connect.use(req, {}, () => {
       req.session.referal_medium.should.equal('google_plus')
       return done()
     })
@@ -105,7 +105,7 @@ describe('Referal connect middle wear', function() {
       query: { rm: 'e' },
       session: {}
     }
-    return this.connect.use(req, {}, function() {
+    return this.connect.use(req, {}, () => {
       req.session.referal_medium.should.equal('email')
       return done()
     })
@@ -116,7 +116,7 @@ describe('Referal connect middle wear', function() {
       query: { rm: 'd' },
       session: {}
     }
-    return this.connect.use(req, {}, function() {
+    return this.connect.use(req, {}, () => {
       req.session.referal_medium.should.equal('direct')
       return done()
     })
@@ -127,7 +127,7 @@ describe('Referal connect middle wear', function() {
       query: { rs: 'b' },
       session: {}
     }
-    return this.connect.use(req, {}, function() {
+    return this.connect.use(req, {}, () => {
       req.session.referal_source.should.equal('bonus')
       return done()
     })
@@ -138,7 +138,7 @@ describe('Referal connect middle wear', function() {
       query: { rs: 'ps' },
       session: {}
     }
-    return this.connect.use(req, {}, function() {
+    return this.connect.use(req, {}, () => {
       req.session.referal_source.should.equal('public_share')
       return done()
     })
@@ -149,7 +149,7 @@ describe('Referal connect middle wear', function() {
       query: { rs: 'ci' },
       session: {}
     }
-    return this.connect.use(req, {}, function() {
+    return this.connect.use(req, {}, () => {
       req.session.referal_source.should.equal('collaborator_invite')
       return done()
     })

services/web/test/unit/src/Referal/ReferalControllerTests.js

@@ -19,7 +19,7 @@ const modulePath = require('path').join(
   '../../../../app/src/Features/Referal/ReferalController.js'
 )
 
-describe('Referal controller', () =>
+describe('Referal controller', function() {
   beforeEach(function() {
     return (this.controller = SandboxedModule.require(modulePath, {
       globals: {
@@ -32,4 +32,5 @@ describe('Referal controller', () =>
         }
       }
     }))
-  }))
+  })
+})

services/web/test/unit/src/Referal/ReferalHandlerTests.js

@@ -48,57 +48,53 @@ describe('Referal handler', function() {
       }
       this.User.findById.callsArgWith(1, null, user)
 
-      return this.handler.getReferedUsers(this.user_id, function(
-        err,
-        passedReferedUserIds,
-        passedReferedUserCount
-      ) {
-        passedReferedUserIds.should.deep.equal(user.refered_users)
-        passedReferedUserCount.should.equal(3)
-        return done()
-      })
+      return this.handler.getReferedUsers(
+        this.user_id,
+        (err, passedReferedUserIds, passedReferedUserCount) => {
+          passedReferedUserIds.should.deep.equal(user.refered_users)
+          passedReferedUserCount.should.equal(3)
+          return done()
+        }
+      )
     })
 
     it('should return an empty array if it is not set', function(done) {
       const user = {}
       this.User.findById.callsArgWith(1, null, user)
 
-      return this.handler.getReferedUsers(this.user_id, function(
-        err,
-        passedReferedUserIds,
-        passedReferedUserCount
-      ) {
-        passedReferedUserIds.length.should.equal(0)
-        return done()
-      })
+      return this.handler.getReferedUsers(
+        this.user_id,
+        (err, passedReferedUserIds, passedReferedUserCount) => {
+          passedReferedUserIds.length.should.equal(0)
+          return done()
+        }
+      )
     })
 
     it('should return a zero count if netither it or the array are set', function(done) {
       const user = {}
       this.User.findById.callsArgWith(1, null, user)
 
-      return this.handler.getReferedUsers(this.user_id, function(
-        err,
-        passedReferedUserIds,
-        passedReferedUserCount
-      ) {
-        passedReferedUserCount.should.equal(0)
-        return done()
-      })
+      return this.handler.getReferedUsers(
+        this.user_id,
+        (err, passedReferedUserIds, passedReferedUserCount) => {
+          passedReferedUserCount.should.equal(0)
+          return done()
+        }
+      )
     })
 
     it('should return the array length if count is not set', function(done) {
       const user = { refered_users: ['1234', '312312', '3213129'] }
       this.User.findById.callsArgWith(1, null, user)
 
-      return this.handler.getReferedUsers(this.user_id, function(
-        err,
-        passedReferedUserIds,
-        passedReferedUserCount
-      ) {
-        passedReferedUserCount.should.equal(3)
-        return done()
-      })
+      return this.handler.getReferedUsers(
+        this.user_id,
+        (err, passedReferedUserIds, passedReferedUserCount) => {
+          passedReferedUserCount.should.equal(3)
+          return done()
+        }
+      )
     })
 
     it('should return the count if it differs from the array length', function(done) {
@@ -108,14 +104,13 @@ describe('Referal handler', function() {
       }
       this.User.findById.callsArgWith(1, null, user)
 
-      return this.handler.getReferedUsers(this.user_id, function(
-        err,
-        passedReferedUserIds,
-        passedReferedUserCount
-      ) {
-        passedReferedUserCount.should.equal(5)
-        return done()
-      })
+      return this.handler.getReferedUsers(
+        this.user_id,
+        (err, passedReferedUserIds, passedReferedUserCount) => {
+          passedReferedUserCount.should.equal(5)
+          return done()
+        }
+      )
     })
   })
 })

services/web/test/unit/src/Security/OneTimeTokenHandlerTests.js

@@ -48,7 +48,9 @@ describe('OneTimeTokenHandler', function() {
     }))
   })
 
-  afterEach(() => tk.reset())
+  afterEach(function() {
+    return tk.reset()
+  })
 
   describe('getNewToken', function() {
     beforeEach(function() {

services/web/test/unit/src/Subscription/LimitationsManagerTests.js

@@ -386,36 +386,36 @@ describe('LimitationsManager', function() {
       this.SubscriptionLocator.getUsersSubscription.callsArgWith(1, null, {
         recurlySubscription_id: '1234'
       })
-      return this.LimitationsManager.userHasV2Subscription(this.user, function(
-        err,
-        hasSubscription
-      ) {
-        hasSubscription.should.equal(true)
-        return done()
-      })
+      return this.LimitationsManager.userHasV2Subscription(
+        this.user,
+        (err, hasSubscription) => {
+          hasSubscription.should.equal(true)
+          return done()
+        }
+      )
     })
 
     it('should return false if the recurly token is not set', function(done) {
       this.SubscriptionLocator.getUsersSubscription.callsArgWith(1, null, {})
       this.subscription = {}
-      return this.LimitationsManager.userHasV2Subscription(this.user, function(
-        err,
-        hasSubscription
-      ) {
-        hasSubscription.should.equal(false)
-        return done()
-      })
+      return this.LimitationsManager.userHasV2Subscription(
+        this.user,
+        (err, hasSubscription) => {
+          hasSubscription.should.equal(false)
+          return done()
+        }
+      )
     })
 
     it('should return false if the subscription is undefined', function(done) {
       this.SubscriptionLocator.getUsersSubscription.callsArgWith(1)
-      return this.LimitationsManager.userHasV2Subscription(this.user, function(
-        err,
-        hasSubscription
-      ) {
-        hasSubscription.should.equal(false)
-        return done()
-      })
+      return this.LimitationsManager.userHasV2Subscription(
+        this.user,
+        (err, hasSubscription) => {
+          hasSubscription.should.equal(false)
+          return done()
+        }
+      )
     })
 
     it('should return the subscription', function(done) {
@@ -425,14 +425,13 @@ describe('LimitationsManager', function() {
         null,
         stubbedSubscription
       )
-      return this.LimitationsManager.userHasV2Subscription(this.user, function(
-        err,
-        hasSubOrIsGroupMember,
-        subscription
-      ) {
-        subscription.should.deep.equal(stubbedSubscription)
-        return done()
-      })
+      return this.LimitationsManager.userHasV2Subscription(
+        this.user,
+        (err, hasSubOrIsGroupMember, subscription) => {
+          subscription.should.deep.equal(stubbedSubscription)
+          return done()
+        }
+      )
     })
 
     describe('when user has a custom account', function() {
@@ -448,7 +447,7 @@ describe('LimitationsManager', function() {
       it('should return true', function(done) {
         return this.LimitationsManager.userHasV2Subscription(
           this.user,
-          function(err, hasSubscription, subscription) {
+          (err, hasSubscription, subscription) => {
             hasSubscription.should.equal(true)
             return done()
           }
@@ -476,7 +475,7 @@ describe('LimitationsManager', function() {
       this.SubscriptionLocator.getMemberSubscriptions.callsArgWith(1, null, [])
       return this.LimitationsManager.userIsMemberOfGroupSubscription(
         this.user,
-        function(err, isMember) {
+        (err, isMember) => {
           isMember.should.equal(false)
           return done()
         }
@@ -492,7 +491,7 @@ describe('LimitationsManager', function() {
       )
       return this.LimitationsManager.userIsMemberOfGroupSubscription(
         this.user,
-        function(err, isMember, retSubscriptions) {
+        (err, isMember, retSubscriptions) => {
           isMember.should.equal(true)
           retSubscriptions.should.equal(subscriptions)
           return done()
@@ -518,55 +517,55 @@ describe('LimitationsManager', function() {
       this.LimitationsManager.userIsMemberOfGroupSubscription = sinon
         .stub()
         .yields(null, true)
-      return this.LimitationsManager.hasPaidSubscription(this.user, function(
-        err,
-        hasSubOrIsGroupMember
-      ) {
-        hasSubOrIsGroupMember.should.equal(true)
-        return done()
-      })
+      return this.LimitationsManager.hasPaidSubscription(
+        this.user,
+        (err, hasSubOrIsGroupMember) => {
+          hasSubOrIsGroupMember.should.equal(true)
+          return done()
+        }
+      )
     })
 
     it('should return true if userHasV2Subscription', function(done) {
       this.LimitationsManager.userHasV2Subscription = sinon
         .stub()
         .yields(null, true)
-      return this.LimitationsManager.hasPaidSubscription(this.user, function(
-        err,
-        hasSubOrIsGroupMember
-      ) {
-        hasSubOrIsGroupMember.should.equal(true)
-        return done()
-      })
+      return this.LimitationsManager.hasPaidSubscription(
+        this.user,
+        (err, hasSubOrIsGroupMember) => {
+          hasSubOrIsGroupMember.should.equal(true)
+          return done()
+        }
+      )
     })
 
     it('should return true if userHasV1Subscription', function(done) {
       this.LimitationsManager.userHasV1Subscription = sinon
         .stub()
         .yields(null, true)
-      return this.LimitationsManager.hasPaidSubscription(this.user, function(
-        err,
-        hasSubOrIsGroupMember
-      ) {
-        hasSubOrIsGroupMember.should.equal(true)
-        return done()
-      })
+      return this.LimitationsManager.hasPaidSubscription(
+        this.user,
+        (err, hasSubOrIsGroupMember) => {
+          hasSubOrIsGroupMember.should.equal(true)
+          return done()
+        }
+      )
     })
 
     it('should return false if none are true', function(done) {
-      return this.LimitationsManager.hasPaidSubscription(this.user, function(
-        err,
-        hasSubOrIsGroupMember
-      ) {
-        hasSubOrIsGroupMember.should.equal(false)
-        return done()
-      })
+      return this.LimitationsManager.hasPaidSubscription(
+        this.user,
+        (err, hasSubOrIsGroupMember) => {
+          hasSubOrIsGroupMember.should.equal(false)
+          return done()
+        }
+      )
     })
 
     it('should have userHasSubscriptionOrIsGroupMember alias', function(done) {
       return this.LimitationsManager.userHasSubscriptionOrIsGroupMember(
         this.user,
-        function(err, hasSubOrIsGroupMember) {
+        (err, hasSubOrIsGroupMember) => {
           hasSubOrIsGroupMember.should.equal(false)
           return done()
         }
@@ -590,7 +589,7 @@ describe('LimitationsManager', function() {
         .yields(null, true)
       return this.LimitationsManager.userHasV1OrV2Subscription(
         this.user,
-        function(err, hasSub) {
+        (err, hasSub) => {
           hasSub.should.equal(true)
           return done()
         }
@@ -603,7 +602,7 @@ describe('LimitationsManager', function() {
         .yields(null, true)
       return this.LimitationsManager.userHasV1OrV2Subscription(
         this.user,
-        function(err, hasSub) {
+        (err, hasSub) => {
           hasSub.should.equal(true)
           return done()
         }
@@ -613,7 +612,7 @@ describe('LimitationsManager', function() {
     it('should return false if none are true', function(done) {
       return this.LimitationsManager.userHasV1OrV2Subscription(
         this.user,
-        function(err, hasSub) {
+        (err, hasSub) => {
           hasSub.should.equal(false)
           return done()
         }
@@ -641,7 +640,7 @@ describe('LimitationsManager', function() {
       )
       return this.LimitationsManager.hasGroupMembersLimitReached(
         this.subscriptionId,
-        function(err, limitReached) {
+        (err, limitReached) => {
           limitReached.should.equal(true)
           return done()
         }
@@ -657,7 +656,7 @@ describe('LimitationsManager', function() {
       )
       return this.LimitationsManager.hasGroupMembersLimitReached(
         this.subscriptionId,
-        function(err, limitReached) {
+        (err, limitReached) => {
           limitReached.should.equal(false)
           return done()
         }
@@ -673,7 +672,7 @@ describe('LimitationsManager', function() {
       )
       return this.LimitationsManager.hasGroupMembersLimitReached(
         this.subscriptionId,
-        function(err, limitReached) {
+        (err, limitReached) => {
           limitReached.should.equal(true)
           return done()
         }

services/web/test/unit/src/Subscription/RecurlyWrapperTests.js

@@ -162,7 +162,9 @@ describe('RecurlyWrapper', function() {
     ))
   })
 
-  after(() => tk.reset())
+  after(function() {
+    return tk.reset()
+  })
 
   describe('getSubscription', function() {
     describe('with proper subscription id', function() {

services/web/test/unit/src/Subscription/SubscriptionControllerTests.js

@@ -200,17 +200,18 @@ describe('SubscriptionController', function() {
         return this.PlansLocator.findLocalPlanInSettings.returns({})
       })
 
-      describe('with a valid plan code', () =>
+      describe('with a valid plan code', function() {
         it('should render the new subscription page', function(done) {
           this.res.render = (page, opts) => {
             page.should.equal('subscriptions/new')
             return done()
           }
           return this.SubscriptionController.paymentPage(this.req, this.res)
-        }))
+        })
+      })
     })
 
-    describe('with a user with subscription', () =>
+    describe('with a user with subscription', function() {
       it('should redirect to the subscription dashboard', function(done) {
         this.LimitationsManager.userHasV1OrV2Subscription.callsArgWith(
           1,
@@ -222,9 +223,10 @@ describe('SubscriptionController', function() {
           return done()
         }
         return this.SubscriptionController.paymentPage(this.req, this.res)
-      }))
+      })
+    })
 
-    describe('with an invalid plan code', () =>
+    describe('with an invalid plan code', function() {
       it('should redirect to the subscription dashboard', function(done) {
         this.LimitationsManager.userHasV1OrV2Subscription.callsArgWith(
           1,
@@ -237,7 +239,8 @@ describe('SubscriptionController', function() {
           return done()
         }
         return this.SubscriptionController.paymentPage(this.req, this.res)
-      }))
+      })
+    })
 
     describe('which currency to use', function() {
       beforeEach(function() {
@@ -278,7 +281,7 @@ describe('SubscriptionController', function() {
       })
     })
 
-    describe('with a recurly subscription already', () =>
+    describe('with a recurly subscription already', function() {
       it('should redirect to the subscription dashboard', function(done) {
         this.LimitationsManager.userHasV1OrV2Subscription.callsArgWith(
           1,
@@ -293,10 +296,11 @@ describe('SubscriptionController', function() {
           return done()
         }
         return this.SubscriptionController.paymentPage(this.req, this.res)
-      }))
+      })
+    })
   })
 
-  describe('successful_subscription', () =>
+  describe('successful_subscription', function() {
     beforeEach(function(done) {
       this.SubscriptionViewModelBuilder.buildUsersSubscriptionViewModel.callsArgWith(
         1,
@@ -308,7 +312,8 @@ describe('SubscriptionController', function() {
         this.req,
         this.res
       )
-    }))
+    })
+  })
 
   describe('userSubscriptionPage', function() {
     beforeEach(function(done) {

services/web/test/unit/src/Subscription/SubscriptionGroupControllerTests.js

@@ -74,7 +74,7 @@ describe('SubscriptionGroupController', function() {
     }))
   })
 
-  describe('removeUserFromGroup', () =>
+  describe('removeUserFromGroup', function() {
     it('should use the subscription id for the logged in user and take the user id from the params', function(done) {
       const userIdToRemove = '31231'
       this.req.params = { user_id: userIdToRemove }
@@ -89,5 +89,6 @@ describe('SubscriptionGroupController', function() {
         }
       }
       return this.Controller.removeUserFromGroup(this.req, res)
-    }))
+    })
+  })
 })

services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js

@@ -116,7 +116,7 @@ describe('SubscriptionGroupHandler', function() {
     }))
   })
 
-  describe('removeUserFromGroup', () =>
+  describe('removeUserFromGroup', function() {
     it('should call the subscription updater to remove the user', function(done) {
       return this.Handler.removeUserFromGroup(
         this.adminUser_id,
@@ -128,7 +128,8 @@ describe('SubscriptionGroupHandler', function() {
           return done()
         }
       )
-    }))
+    })
+  })
 
   describe('replaceUserReferencesInGroups', function() {
     beforeEach(function(done) {
@@ -196,7 +197,7 @@ describe('SubscriptionGroupHandler', function() {
       return this.Handler.isUserPartOfGroup(
         this.user_id,
         this.subscription_id,
-        function(err, partOfGroup) {
+        (err, partOfGroup) => {
           partOfGroup.should.equal(true)
           return done()
         }
@@ -211,7 +212,7 @@ describe('SubscriptionGroupHandler', function() {
       return this.Handler.isUserPartOfGroup(
         this.user_id,
         this.subscription_id,
-        function(err, partOfGroup) {
+        (err, partOfGroup) => {
           partOfGroup.should.equal(false)
           return done()
         }
@@ -237,7 +238,7 @@ describe('SubscriptionGroupHandler', function() {
         )
       })
     })
-    describe('for nonexistent subscriptions', () =>
+    describe('for nonexistent subscriptions', function() {
       it('should return undefined', function(done) {
         return this.Handler.getTotalConfirmedUsersInGroup(
           'fake-id',
@@ -246,6 +247,7 @@ describe('SubscriptionGroupHandler', function() {
             return done()
           }
         )
-      }))
+      })
+    })
   })
 })

services/web/test/unit/src/Subscription/SubscriptionHandlerTests.js

@@ -177,7 +177,7 @@ describe('SubscriptionHandler', function() {
   })
 
   describe('updateSubscription', function() {
-    describe('with a user with a subscription', () =>
+    describe('with a user with a subscription', function() {
       describe('with a valid plan code', function() {
         beforeEach(function(done) {
           this.plan_code = 'collaborator'
@@ -221,7 +221,8 @@ describe('SubscriptionHandler', function() {
             this.user._id
           )
         })
-      }))
+      })
+    })
 
     describe('with a user without a subscription', function() {
       beforeEach(function(done) {
@@ -383,7 +384,7 @@ describe('SubscriptionHandler', function() {
     })
   })
 
-  describe('recurlyCallback', () =>
+  describe('recurlyCallback', function() {
     describe('with an actionable request', function() {
       beforeEach(function(done) {
         this.user.id = this.activeRecurlySubscription.account.account_code
@@ -418,7 +419,8 @@ describe('SubscriptionHandler', function() {
           this.user._id
         )
       })
-    }))
+    })
+  })
 
   describe('validateNoSubscriptionInRecurly', function() {
     beforeEach(function() {

services/web/test/unit/src/Subscription/SubscriptionLocatorTests.js

@@ -82,7 +82,7 @@ describe('Subscription Locator Tests', function() {
       )
     })
 
-    describe('finding managed subscription', () =>
+    describe('finding managed subscription', function() {
       it('should query the database', function(done) {
         this.Subscription.findOne.callsArgWith(1, null, this.subscription)
         return this.SubscriptionLocator.findManagedSubscription(
@@ -95,6 +95,7 @@ describe('Subscription Locator Tests', function() {
             return done()
           }
         )
-      }))
+      })
+    })
   })
 })

services/web/test/unit/src/Subscription/SubscriptionUpdaterTests.js

@@ -309,7 +309,7 @@ describe('SubscriptionUpdater', function() {
     })
   })
 
-  describe('_createNewSubscription', () =>
+  describe('_createNewSubscription', function() {
     it('should create a new subscription then update the subscription', function(done) {
       this.SubscriptionUpdater._createNewSubscription(
         this.adminUser._id,
@@ -320,7 +320,8 @@ describe('SubscriptionUpdater', function() {
           done()
         }
       )
-    }))
+    })
+  })
 
   describe('addUserToGroup', function() {
     beforeEach(function() {

services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js

@@ -118,14 +118,13 @@ describe('TeamInvitesHandler', function() {
     it("returns teamNotFound if there's none", function(done) {
       this.Subscription.findOne = sinon.stub().yields(null, null)
 
-      this.TeamInvitesHandler.getInvite(this.token, function(
-        err,
-        invite,
-        subscription
-      ) {
-        expect(err).to.be.instanceof(Errors.NotFoundError)
-        done()
-      })
+      this.TeamInvitesHandler.getInvite(
+        this.token,
+        (err, invite, subscription) => {
+          expect(err).to.be.instanceof(Errors.NotFoundError)
+          done()
+        }
+      )
     })
   })
 
@@ -304,7 +303,7 @@ describe('TeamInvitesHandler', function() {
     })
   })
 
-  describe('revokeInvite', () =>
+  describe('revokeInvite', function() {
     it('removes the team invite from the subscription', function(done) {
       this.TeamInvitesHandler.revokeInvite(
         this.manager._id,
@@ -327,7 +326,8 @@ describe('TeamInvitesHandler', function() {
           done()
         }
       )
-    }))
+    })
+  })
 
   describe('createTeamInvitesForLegacyInvitedEmail', function(done) {
     beforeEach(function() {

services/web/test/unit/src/Subscription/UserFeaturesUpdaterTests.js

@@ -37,7 +37,7 @@ describe('UserFeaturesUpdater', function() {
     }))
   })
 
-  describe('updateFeatures', () =>
+  describe('updateFeatures', function() {
     it('should send the users features', function(done) {
       const user_id = '5208dd34438842e2db000005'
       this.features = { versioning: true, collaborators: 10 }
@@ -56,5 +56,6 @@ describe('UserFeaturesUpdater', function() {
           return done()
         }
       )
-    }))
+    })
+  })
 })

services/web/test/unit/src/Subscription/V1SusbcriptionManagerTests.js

@@ -120,15 +120,16 @@ describe('V1SubscriptionManager', function() {
   })
 
   describe('getGrandfatheredFeaturesForV1User', function() {
-    describe('when the user ID is greater than the cutoff', () =>
+    describe('when the user ID is greater than the cutoff', function() {
       it('should return an empty feature set', function(done) {
         expect(
           this.V1SubscriptionManager.getGrandfatheredFeaturesForV1User(100)
         ).to.eql({})
         return done()
-      }))
+      })
+    })
 
-    describe('when the user ID is less than the cutoff', () =>
+    describe('when the user ID is less than the cutoff', function() {
       it('should return a feature set with grandfathered properties for github and mendeley', function(done) {
         expect(
           this.V1SubscriptionManager.getGrandfatheredFeaturesForV1User(1)
@@ -137,7 +138,8 @@ describe('V1SubscriptionManager', function() {
           mendeley: true
         })
         return done()
-      }))
+      })
+    })
   })
 
   describe('_v1Request', function() {

services/web/test/unit/src/SudoMode/SudoModeHandlerTests.js

@@ -49,12 +49,13 @@ describe('SudoModeHandler', function() {
     }))
   })
 
-  describe('_buildKey', () =>
+  describe('_buildKey', function() {
     it('should build a properly formed key', function() {
       return expect(this.SudoModeHandler._buildKey('123')).to.equal(
         'SudoMode:{123}'
       )
-    }))
+    })
+  })
 
   describe('activateSudoMode', function() {
     beforeEach(function() {

services/web/test/unit/src/Tags/TagsControllerTests.js

@@ -69,7 +69,7 @@ describe('TagsController', function() {
     return (this.res.json = sinon.stub())
   })
 
-  describe('getAllTags', () =>
+  describe('getAllTags', function() {
     it('should ask the handler for all tags', function(done) {
       const allTags = [{ name: 'tag', projects: ['123423', '423423'] }]
       this.handler.getAllTags = sinon.stub().callsArgWith(1, null, allTags)
@@ -80,7 +80,8 @@ describe('TagsController', function() {
           return done()
         }
       })
-    }))
+    })
+  })
 
   describe('createTag', function() {
     beforeEach(function() {

services/web/test/unit/src/Tags/TagsHandlerTests.js

@@ -53,7 +53,7 @@ describe('TagsHandler', function() {
     }))
   })
 
-  describe('removeProjectFromAllTags', () =>
+  describe('removeProjectFromAllTags', function() {
     it('should tell the tags api to remove the project_id from all the users tags', function(done) {
       return this.handler.removeProjectFromAllTags(user_id, project_id, () => {
         this.request.del
@@ -64,7 +64,8 @@ describe('TagsHandler', function() {
           .should.equal(true)
         return done()
       })
-    }))
+    })
+  })
 
   describe('_requestTags', function() {
     it('should return an err and empty array on error', function(done) {

services/web/test/unit/src/ThirdPartyDataStore/TpdsControllerTests.js

@@ -42,7 +42,7 @@ describe('TpdsController', function() {
     this.user_id = 'dsad29jlkjas'
   })
 
-  describe('getting an update', () => {
+  describe('getting an update', function() {
     it('should process the update with the update receiver', function(done) {
       const path = '/projectName/here.txt'
       const req = {
@@ -118,7 +118,7 @@ describe('TpdsController', function() {
     })
   })
 
-  describe('getting a delete update', () =>
+  describe('getting a delete update', function() {
     it('should process the delete with the update reciver', function(done) {
       const path = '/projectName/here.txt'
       const req = {
@@ -140,7 +140,8 @@ describe('TpdsController', function() {
         }
       }
       this.TpdsController.deleteUpdate(req, res)
-    }))
+    })
+  })
 
   describe('parseParams', function() {
     it('should take the project name off the start and replace with slash', function() {
@@ -152,7 +153,7 @@ describe('TpdsController', function() {
       result.projectName.should.equal(path)
     })
 
-    it('should take the project name off the start and return it with no slashes in', function() {
+    it('should take the project name off the start and it with no slashes in', function() {
       const path = '/project/file.tex'
       const req = { params: { 0: path, user_id: this.user_id } }
       const result = this.TpdsController.parseParams(req)

services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSenderTests.js

@@ -125,7 +125,7 @@ describe('TpdsUpdateSender', function() {
       }
       return this.updateSender.addFile(
         { project_id, file_id, path, project_name },
-        function() {}
+        () => {}
       )
     })
 

services/web/test/unit/src/TokenAccess/TokenAccessHandlerTests.js

@@ -86,7 +86,7 @@ describe('TokenAccessHandler', function() {
     it('should return projectExists flag as true', function(done) {
       return this.TokenAccessHandler.findProjectWithReadOnlyToken(
         this.token,
-        function(err, project, projectExists) {
+        (err, project, projectExists) => {
           expect(projectExists).to.equal(true)
           return done()
         }
@@ -124,7 +124,7 @@ describe('TokenAccessHandler', function() {
       it('should not return a project', function(done) {
         return this.TokenAccessHandler.findProjectWithReadOnlyToken(
           this.token,
-          function(err, project) {
+          (err, project) => {
             expect(err).to.not.exist
             expect(project).to.not.exist
             return done()
@@ -135,7 +135,7 @@ describe('TokenAccessHandler', function() {
       it('should return projectExists flag as true', function(done) {
         return this.TokenAccessHandler.findProjectWithReadOnlyToken(
           this.token,
-          function(err, project, projectExists) {
+          (err, project, projectExists) => {
             expect(projectExists).to.equal(true)
             return done()
           }
@@ -151,7 +151,7 @@ describe('TokenAccessHandler', function() {
       it('should not return a project', function(done) {
         return this.TokenAccessHandler.findProjectWithReadOnlyToken(
           this.token,
-          function(err, project) {
+          (err, project) => {
             expect(err).to.not.exist
             expect(project).to.not.exist
             return done()
@@ -162,7 +162,7 @@ describe('TokenAccessHandler', function() {
       it('should return projectExists flag as false', function(done) {
         return this.TokenAccessHandler.findProjectWithReadOnlyToken(
           this.token,
-          function(err, project, projectExists) {
+          (err, project, projectExists) => {
             expect(projectExists).to.equal(false)
             return done()
           }
@@ -215,7 +215,7 @@ describe('TokenAccessHandler', function() {
     it('should return projectExists flag as true', function(done) {
       return this.TokenAccessHandler.findProjectWithReadAndWriteToken(
         this.token,
-        function(err, project, projectExists) {
+        (err, project, projectExists) => {
           expect(projectExists).to.equal(true)
           return done()
         }
@@ -253,7 +253,7 @@ describe('TokenAccessHandler', function() {
       it('should not return a project', function(done) {
         return this.TokenAccessHandler.findProjectWithReadAndWriteToken(
           this.token,
-          function(err, project) {
+          (err, project) => {
             expect(err).to.not.exist
             expect(project).to.not.exist
             return done()
@@ -264,7 +264,7 @@ describe('TokenAccessHandler', function() {
       it('should return projectExists flag as true', function(done) {
         return this.TokenAccessHandler.findProjectWithReadAndWriteToken(
           this.token,
-          function(err, project, projectExists) {
+          (err, project, projectExists) => {
             expect(projectExists).to.equal(true)
             return done()
           }
@@ -287,7 +287,7 @@ describe('TokenAccessHandler', function() {
       it('should not return a project', function(done) {
         return this.TokenAccessHandler.findProjectWithReadAndWriteToken(
           this.token,
-          function(err, project) {
+          (err, project) => {
             expect(err).to.not.exist
             expect(project).to.not.exist
             return done()

services/web/test/unit/src/Uploads/ProjectUploadManagerTests.js

@@ -386,7 +386,7 @@ describe('ProjectUploadManager', function() {
     })
   })
 
-  describe('_getDestinationDirectory', () =>
+  describe('_getDestinationDirectory', function() {
     it('should return the path with the time appended', function() {
       const date = Date.now()
       sinon.stub(Date, 'now', () => date)
@@ -394,5 +394,6 @@ describe('ProjectUploadManager', function() {
         '/path/to/zip/file.zip'
       ).should.equal(`/path/to/zip/file-${date}`)
       Date.now.restore()
-    }))
+    })
+  })
 })

services/web/test/unit/src/User/UserControllerTests.js

@@ -269,7 +269,7 @@ describe('UserController', function() {
     })
   })
 
-  describe('unsubscribe', () =>
+  describe('unsubscribe', function() {
     it('should send the user to unsubscribe', function(done) {
       this.res.send = code => {
         this.NewsLetterManager.unsubscribe
@@ -278,7 +278,8 @@ describe('UserController', function() {
         return done()
       }
       return this.UserController.unsubscribe(this.req, this.res)
-    }))
+    })
+  })
 
   describe('updateUserSettings', function() {
     beforeEach(function() {
@@ -501,7 +502,7 @@ describe('UserController', function() {
       return this.UserController.clearSessions(this.req, this.res)
     })
 
-    describe('when revokeAllUserSessions produces an error', () =>
+    describe('when revokeAllUserSessions produces an error', function() {
       it('should call next with an error', function(done) {
         this.UserSessionsManager.revokeAllUserSessions.callsArgWith(
           2,
@@ -513,7 +514,8 @@ describe('UserController', function() {
           return done()
         }
         return this.UserController.clearSessions(this.req, this.res, next)
-      }))
+      })
+    })
   })
 
   describe('changePassword', function() {

services/web/test/unit/src/User/UserDeleterTests.js

@@ -12,8 +12,8 @@ const expect = chai.expect
 
 const modulePath = '../../../../app/src/Features/User/UserDeleter.js'
 
-describe('UserDeleter', () => {
-  beforeEach(() => {
+describe('UserDeleter', function() {
+  beforeEach(function() {
     tk.freeze(Date.now())
 
     this.userId = ObjectId()
@@ -90,14 +90,14 @@ describe('UserDeleter', () => {
     })
   })
 
-  afterEach(() => {
+  afterEach(function() {
     this.DeletedUserMock.restore()
     this.UserMock.restore()
     this.mockedUser.restore()
   })
 
-  describe('deleteUser', () => {
-    beforeEach(() => {
+  describe('deleteUser', function() {
+    beforeEach(function() {
       this.UserDeleter.promises.ensureCanDeleteUser = sinon.stub().resolves()
 
       this.UserMock.expects('findById')
@@ -106,8 +106,8 @@ describe('UserDeleter', () => {
         .resolves(this.user)
     })
 
-    describe('when the user can be deleted', () => {
-      beforeEach(() => {
+    describe('when the user can be deleted', function() {
+      beforeEach(function() {
         this.deletedUser = {
           user: this.user,
           deleterData: {
@@ -131,81 +131,81 @@ describe('UserDeleter', () => {
           .resolves()
       })
 
-      describe('when no options are passed', () => {
-        beforeEach(() => {
+      describe('when no options are passed', function() {
+        beforeEach(function() {
           this.DeletedUserMock.expects('create')
             .withArgs(this.deletedUser)
             .chain('exec')
             .resolves()
         })
 
-        it('should find and the user in mongo by its id', async () => {
+        it('should find and the user in mongo by its id', async function() {
           await this.UserDeleter.promises.deleteUser(this.userId)
           this.UserMock.verify()
         })
 
-        it('should unsubscribe the user from the news letter', async () => {
+        it('should unsubscribe the user from the news letter', async function() {
           await this.UserDeleter.promises.deleteUser(this.userId)
           expect(this.NewsletterManager.unsubscribe).to.have.been.calledWith(
             this.user
           )
         })
 
-        it('should delete all the projects of a user', async () => {
+        it('should delete all the projects of a user', async function() {
           await this.UserDeleter.promises.deleteUser(this.userId)
           expect(
             this.ProjectDeleter.promises.deleteUsersProjects
           ).to.have.been.calledWith(this.userId)
         })
 
-        it("should cancel the user's subscription", async () => {
+        it("should cancel the user's subscription", async function() {
           await this.UserDeleter.promises.deleteUser(this.userId)
           expect(
             this.SubscriptionHandler.cancelSubscription
           ).to.have.been.calledWith(this.user)
         })
 
-        it('should delete user affiliations', async () => {
+        it('should delete user affiliations', async function() {
           await this.UserDeleter.promises.deleteUser(this.userId)
           expect(
             this.InstitutionsApi.deleteAffiliations
           ).to.have.been.calledWith(this.userId)
         })
 
-        it('should remove user from group subscriptions', async () => {
+        it('should remove user from group subscriptions', async function() {
           await this.UserDeleter.promises.deleteUser(this.userId)
           expect(
             this.SubscriptionUpdater.removeUserFromAllGroups
           ).to.have.been.calledWith(this.userId)
         })
 
-        it('should remove user memberships', async () => {
+        it('should remove user memberships', async function() {
           await this.UserDeleter.promises.deleteUser(this.userId)
           expect(
             this.UserMembershipsHandler.removeUserFromAllEntities
           ).to.have.been.calledWith(this.userId)
         })
 
-        it('ensures user can be deleted', async () => {
+        it('ensures user can be deleted', async function() {
           await this.UserDeleter.promises.deleteUser(this.userId)
           expect(
             this.UserDeleter.promises.ensureCanDeleteUser
           ).to.have.been.calledWith(this.user)
         })
 
-        it('should create a deletedUser', async () => {
+        it('should create a deletedUser', async function() {
           await this.UserDeleter.promises.deleteUser(this.userId)
           this.DeletedUserMock.verify()
         })
 
-        describe('when unsubscribing from mailchimp fails', () => {
-          beforeEach(() => {
+        describe('when unsubscribing from mailchimp fails', function() {
+          beforeEach(function() {
             this.NewsletterManager.unsubscribe = sinon
               .stub()
               .yields(new Error('something went wrong'))
           })
 
-          it('should not return an error', async () => {
+          it('should not return an error', async function() {
             try {
               await this.UserDeleter.promises.deleteUser(this.userId)
             } catch (error) {
@@ -218,19 +218,19 @@ describe('UserDeleter', () => {
             )
           })
 
-          it('should delete the user', async () => {
+          it('should delete the user', async function() {
             await this.UserDeleter.promises.deleteUser(this.userId)
             this.UserMock.verify()
           })
 
-          it('should log an error', async () => {
+          it('should log an error', async function() {
             await this.UserDeleter.promises.deleteUser(this.userId)
             sinon.assert.called(this.logger.err)
           })
         })
 
-        describe('when called as a callback', () => {
-          it('should delete the user', done => {
+        describe('when called as a callback', function() {
+          it('should delete the user', function(done) {
             this.UserDeleter.deleteUser(this.userId, err => {
               expect(err).not.to.exist
               this.UserMock.verify()
@@ -241,8 +241,8 @@ describe('UserDeleter', () => {
         })
       })
 
-      describe('when a user and IP address are specified', () => {
-        beforeEach(() => {
+      describe('when a user and IP address are specified', function() {
+        beforeEach(function() {
           this.ipAddress = '1.2.3.4'
           this.deleterId = ObjectId()
 
@@ -255,7 +255,7 @@ describe('UserDeleter', () => {
             .resolves()
         })
 
-        it('should add the deleted user id and ip address to the deletedUser', async () => {
+        it('should add the deleted user id and ip address to the deletedUser', async function() {
           await this.UserDeleter.promises.deleteUser(this.userId, {
             deleterUser: { _id: this.deleterId },
             ipAddress: this.ipAddress
@@ -263,8 +263,8 @@ describe('UserDeleter', () => {
           this.DeletedUserMock.verify()
         })
 
-        describe('when called as a callback', () => {
-          it('should delete the user', done => {
+        describe('when called as a callback', function() {
+          it('should delete the user', function(done) {
             this.UserDeleter.deleteUser(
               this.userId,
               {
@@ -283,14 +283,14 @@ describe('UserDeleter', () => {
       })
     })
 
-    describe('when the user cannot be deleted because they are a subscription admin', () => {
-      beforeEach(() => {
+    describe('when the user cannot be deleted because they are a subscription admin', function() {
+      beforeEach(function() {
         this.UserDeleter.promises.ensureCanDeleteUser.rejects(
           new Errors.SubscriptionAdminDeletionError()
         )
       })
 
-      it('fails with a SubscriptionAdminDeletionError', async () => {
+      it('fails with a SubscriptionAdminDeletionError', async function() {
         let error
         try {
           await this.UserDeleter.promises.deleteUser(this.userId)
@@ -301,7 +301,7 @@ describe('UserDeleter', () => {
         }
       })
 
-      it('should not create a deletedUser', async () => {
+      it('should not create a deletedUser', async function() {
         try {
           await this.UserDeleter.promises.deleteUser(this.userId)
         } catch (e) {
@@ -310,7 +310,7 @@ describe('UserDeleter', () => {
         }
       })
 
-      it('should not remove the user from mongo', async () => {
+      it('should not remove the user from mongo', async function() {
         try {
           await this.UserDeleter.promises.deleteUser(this.userId)
         } catch (e) {
@@ -321,8 +321,8 @@ describe('UserDeleter', () => {
     })
   })
 
-  describe('ensureCanDeleteUser', () => {
-    it('should not return error when user can be deleted', async () => {
+  describe('ensureCanDeleteUser', function() {
+    it('should not return error when user can be deleted', async function() {
       this.SubscriptionLocator.getUsersSubscription.yields(null, null)
       let error
       try {
@@ -334,7 +334,7 @@ describe('UserDeleter', () => {
       }
     })
 
-    it('should return custom error when user is group admin', async () => {
+    it('should return custom error when user is group admin', async function() {
       this.SubscriptionLocator.getUsersSubscription.yields(null, {
         _id: '123abc'
       })
@@ -348,7 +348,7 @@ describe('UserDeleter', () => {
       }
     })
 
-    it('propagates errors', async () => {
+    it('propagates errors', async function() {
       this.SubscriptionLocator.getUsersSubscription.yields(
         new Error('Some error')
       )
@@ -363,8 +363,8 @@ describe('UserDeleter', () => {
     })
   })
 
-  describe('expireDeletedUsersAfterDuration', () => {
-    beforeEach(() => {
+  describe('expireDeletedUsersAfterDuration', function() {
+    beforeEach(function() {
       this.UserDeleter.promises.expireDeletedUser = sinon.stub().resolves()
       this.deletedUsers = [
         {
@@ -390,7 +390,7 @@ describe('UserDeleter', () => {
         .resolves(this.deletedUsers)
     })
 
-    it('calls expireDeletedUser for each user', async () => {
+    it('calls expireDeletedUser for each user', async function() {
       await this.UserDeleter.promises.expireDeletedUsersAfterDuration()
       expect(
         this.UserDeleter.promises.expireDeletedUser
@@ -401,8 +401,8 @@ describe('UserDeleter', () => {
     })
   })
 
-  describe('expireDeletedUser', () => {
-    beforeEach(() => {
+  describe('expireDeletedUser', function() {
+    beforeEach(function() {
       this.mockedDeletedUser = sinon.mock(
         new DeletedUser({
           user: this.user,
@@ -422,37 +422,37 @@ describe('UserDeleter', () => {
         .resolves(this.deletedUser)
     })
 
-    afterEach(() => {
+    afterEach(function() {
       this.mockedDeletedUser.restore()
     })
 
-    it('should find the user by user ID', async () => {
+    it('should find the user by user ID', async function() {
       await this.UserDeleter.promises.expireDeletedUser('giraffe')
       this.DeletedUserMock.verify()
     })
 
-    it('should remove the user data from mongo', async () => {
+    it('should remove the user data from mongo', async function() {
       await this.UserDeleter.promises.expireDeletedUser('giraffe')
       expect(this.deletedUser.user).not.to.exist
     })
 
-    it('should remove the IP address from mongo', async () => {
+    it('should remove the IP address from mongo', async function() {
       await this.UserDeleter.promises.expireDeletedUser('giraffe')
       expect(this.deletedUser.deleterData.ipAddress).not.to.exist
     })
 
-    it('should not delete other deleterData fields', async () => {
+    it('should not delete other deleterData fields', async function() {
       await this.UserDeleter.promises.expireDeletedUser('giraffe')
       expect(this.deletedUser.deleterData.deletedUserId).to.equal(this.userId)
     })
 
-    it('should save the record to mongo', async () => {
+    it('should save the record to mongo', async function() {
       await this.UserDeleter.promises.expireDeletedUser('giraffe')
       this.mockedDeletedUser.verify()
     })
 
-    describe('when called as a callback', () => {
-      it('should expire the user', done => {
+    describe('when called as a callback', function() {
+      it('should expire the user', function(done) {
         this.UserDeleter.expireDeletedUser('giraffe', err => {
           expect(err).not.to.exists
           this.DeletedUserMock.verify()

services/web/test/unit/src/User/UserGetterTests.js

@@ -272,7 +272,7 @@ describe('UserGetter', function() {
     })
   })
 
-  describe('getUsersByHostname', () =>
+  describe('getUsersByHostname', function() {
     it('should find user by hostname', function(done) {
       const hostname = 'bar.foo'
       const expectedQuery = {
@@ -292,9 +292,10 @@ describe('UserGetter', function() {
           return done()
         }
       )
-    }))
+    })
+  })
 
-  describe('getUsersByV1Id', () =>
+  describe('getUsersByV1Id', function() {
     it('should find users by list of v1 ids', function(done) {
       const v1Ids = [501]
       const expectedQuery = {
@@ -310,7 +311,8 @@ describe('UserGetter', function() {
           return done()
         }
       )
-    }))
+    })
+  })
 
   describe('ensureUniqueEmailAddress', function() {
     beforeEach(function() {