Merge branch 'master' into organization-contact

test/server/graph/context.js

@@ -1,6 +1,6 @@
 const User = require('../../../models/user');
 const Context = require('../../../graph/context');
-const errors = require('../../../errors');
+const { ErrNotAuthorized } = require('../../../errors');
 const SettingsService = require('../../../services/settings');
 
 const { expect } = require('chai');
@@ -54,7 +54,7 @@ describe('graph.Context', () => {
           throw new Error('should not reach this point');
         })
         .catch(err => {
-          expect(err).to.be.equal(errors.ErrNotAuthorized);
+          expect(err).to.be.an.instanceof(ErrNotAuthorized);
         });
     });
   });

test/server/services/wordlist.js

@@ -1,4 +1,4 @@
-const Errors = require('../../../errors');
+const { ErrContainsProfanity } = require('../../../errors');
 const Wordlist = require('../../../services/wordlist');
 const SettingsService = require('../../../services/settings');
 
@@ -103,7 +103,8 @@ describe('services.Wordlist', () => {
         'content'
       );
 
-      expect(errors).to.have.property('banned', Errors.ErrContainsProfanity);
+      expect(errors).to.have.property('banned');
+      expect(errors.banned).to.be.an.instanceof(ErrContainsProfanity);
     });
 
     it('does not match on bodies not containing bad words', () => {