simplified test layout

test/helpers/mongoose.js

@@ -1,8 +1,8 @@
 const mongoose = require('../../services/mongoose');
 
-module.exports = {};
+before(function(done) {
+  this.timeout(30000);
 
-module.exports.waitTillConnect = function(done) {
   mongoose.connection.on('open', function(err) {
     if (err) {
       return done(err);
@@ -10,9 +10,9 @@ module.exports.waitTillConnect = function(done) {
 
     return done();
   });
-};
+});
 
-module.exports.clearDB = function(done) {
+beforeEach(function(done) {
   Promise.all(Object.keys(mongoose.connection.collections).map((collection) => {
     return new Promise((resolve, reject) => {
       mongoose.connection.collections[collection].remove(function(err) {
@@ -30,9 +30,9 @@ module.exports.clearDB = function(done) {
   .catch((err) => {
     done(err);
   });
-};
+});
 
-module.exports.disconnect = function(done) {
+after(function(done) {
   mongoose.disconnect();
-  return done();
-};
+  done();
+});

test/helpers/redis.js

@@ -1,15 +1,14 @@
 const {createClient} = require('../../services/redis');
-
-// Create a redis client to use for clearing the database.
+const cache = require('../../services/cache');
 const client = createClient();
 
-module.exports.clearDB = () =>
-  new Promise((resolve, reject) =>
-    client.flushdb((err) => {
-      if (err) {
-        return reject(err);
-      }
+beforeEach(() => Promise.all([
+  new Promise((resolve, reject) => client.flushdb((err) => {
+    if (err) {
+      return reject(err);
+    }
 
-      return resolve();
-    })
-  );
+    return resolve();
+  })),
+  cache.init(),
+]));

test/mocha.opts

@@ -1,6 +1,4 @@
 test/helpers/*.js
-
-test/e2e
 test/server
 --compilers js:babel-core/register
 --require ignore-styles

test/server/graph/context.js

@@ -1,10 +1,11 @@
-const expect = require('chai').expect;
 
 const User = require('../../../models/user');
 const Context = require('../../../graph/context');
 const errors = require('../../../errors');
 const SettingsService = require('../../../services/settings');
 
+const {expect} = require('chai');
+
 describe('graph.Context', () => {
   beforeEach(() => SettingsService.init());
 

test/server/graph/loaders/metrics.js

@@ -1,4 +1,3 @@
-const {expect} = require('chai');
 const {graphql} = require('graphql');
 
 const schema = require('../../../../graph/schema');
@@ -9,6 +8,8 @@ const SettingsService = require('../../../../services/settings');
 const ActionModel = require('../../../../models/action');
 const CommentModel = require('../../../../models/comment');
 
+const {expect} = require('chai');
+
 describe('graph.loaders.Metrics', () => {
   beforeEach(() => SettingsService.init());
 

test/server/graph/mutations/addTag.js

@@ -1,4 +1,3 @@
-const expect = require('chai').expect;
 const {graphql} = require('graphql');
 
 const schema = require('../../../../graph/schema');
@@ -8,6 +7,8 @@ const UserModel = require('../../../../models/user');
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
 
+const {expect} = require('chai');
+
 describe('graph.mutations.addTag', () => {
   let comment, asset;
   beforeEach(async () => {

test/server/graph/mutations/createComment.js

@@ -1,4 +1,3 @@
-const expect = require('chai').expect;
 const {graphql} = require('graphql');
 
 const schema = require('../../../../graph/schema');
@@ -11,6 +10,8 @@ const ActionModel = require('../../../../models/action');
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
 
+const {expect} = require('chai');
+
 describe('graph.mutations.createComment', () => {
   beforeEach(() => SettingsService.init());
 

test/server/graph/mutations/editComment.js

@@ -1,4 +1,3 @@
-const expect = require('chai').expect;
 const {graphql} = require('graphql');
 const timekeeper = require('timekeeper');
 
@@ -9,6 +8,8 @@ const AssetModel = require('../../../../models/asset');
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
 
+const {expect} = require('chai');
+
 describe('graph.mutations.editComment', () => {
   let asset;
   let user;
@@ -133,7 +134,7 @@ describe('graph.mutations.editComment', () => {
     expect(response.errors).to.be.empty;
     expect(response.data.editComment.errors).to.not.be.empty;
     expect(response.data.editComment.errors[0].translation_key).to.equal('NOT_AUTHORIZED');
-    const commentAfterEdit = await CommentsService.findById(comment.id);    
+    const commentAfterEdit = await CommentsService.findById(comment.id);
 
     // it *hasn't* changed from the original
     expect(commentAfterEdit.body).to.equal(comment.body);
@@ -256,7 +257,7 @@ describe('graph.mutations.editComment', () => {
       expect(response.errors).to.be.empty;
       const commentAfterEdit = await CommentsService.findById(comment.id);
       expect(commentAfterEdit.body).to.equal(newBody);
-      expect(commentAfterEdit.status).to.equal(afterEdit.status);      
+      expect(commentAfterEdit.status).to.equal(afterEdit.status);
     });
-  });  
+  });
 });

test/server/graph/mutations/ignoreUser.js

@@ -1,4 +1,3 @@
-const expect = require('chai').expect;
 const {graphql} = require('graphql');
 
 const schema = require('../../../../graph/schema');
@@ -6,6 +5,8 @@ const Context = require('../../../../graph/context');
 const UsersService = require('../../../../services/users');
 const SettingsService = require('../../../../services/settings');
 
+const {expect} = require('chai');
+
 const ignoreUserMutation = `
   mutation ignoreUser ($id: ID!) {
     ignoreUser(id:$id) {

test/server/graph/mutations/removeTag.js

@@ -1,4 +1,3 @@
-const expect = require('chai').expect;
 const {graphql} = require('graphql');
 
 const schema = require('../../../../graph/schema');
@@ -11,6 +10,8 @@ const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
 const TagsService = require('../../../../services/tags');
 
+const {expect} = require('chai');
+
 describe('graph.mutations.removeTag', () => {
   let asset, comment;
   beforeEach(async () => {

test/server/graph/queries/asset.js

@@ -1,4 +1,3 @@
-const expect = require('chai').expect;
 const {graphql} = require('graphql');
 
 const schema = require('../../../../graph/schema');
@@ -8,6 +7,8 @@ const SettingsService = require('../../../../services/settings');
 const Asset = require('../../../../models/asset');
 const CommentsService = require('../../../../services/comments');
 
+const {expect} = require('chai');
+
 describe('graph.queries.asset', () => {
   let asset, users;
   beforeEach(async () => {

test/server/mongoose.js

@@ -1,15 +0,0 @@
-const mongoose = require('../helpers/mongoose');
-
-before(function(done) {
-  this.timeout(30000);
-
-  mongoose.waitTillConnect(done);
-});
-
-beforeEach(function(done) {
-  mongoose.clearDB(done);
-});
-
-after(function(done) {
-  mongoose.disconnect(done);
-});

test/server/redis.js

@@ -1,4 +0,0 @@
-const redis = require('../helpers/redis');
-const cache = require('../../services/cache');
-
-beforeEach(() => Promise.all([redis.clearDB(), cache.init()]));

test/server/routes/api/account/index.js

@@ -1,15 +1,14 @@
 const passport = require('../../../passport');
 
 const app = require('../../../../../app');
-const chai = require('chai');
-const expect = chai.expect;
 
 const SettingsService = require('../../../../../services/settings');
 const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
 
-// Setup chai.
+const chai = require('chai');
 chai.should();
 chai.use(require('chai-http'));
+const expect = chai.expect;
 
 const UsersService = require('../../../../../services/users');
 

test/server/routes/api/assets/index.js

@@ -1,12 +1,11 @@
 const passport = require('../../../passport');
 
 const app = require('../../../../../app');
-const chai = require('chai');
-const expect = chai.expect;
 
-// Setup chai.
+const chai = require('chai');
 chai.should();
 chai.use(require('chai-http'));
+const expect = chai.expect;
 
 const AssetModel = require('../../../../../models/asset');
 const AssetsService = require('../../../../../services/assets');

test/server/routes/api/auth/index.js

@@ -1,8 +1,9 @@
 const app = require('../../../../../app');
-const chai = require('chai');
-const expect = chai.expect;
 
+const chai = require('chai');
+chai.should();
 chai.use(require('chai-http'));
+const expect = chai.expect;
 
 const UsersService = require('../../../../../services/users');
 

test/server/routes/api/settings/index.js

@@ -1,11 +1,11 @@
 const passport = require('../../../passport');
 
 const app = require('../../../../../app');
-const chai = require('chai');
-const expect = chai.expect;
 
+const chai = require('chai');
 chai.should();
 chai.use(require('chai-http'));
+const expect = chai.expect;
 
 const SettingsService = require('../../../../../services/settings');
 const defaults = {id: '1', moderation: 'PRE'};

test/server/routes/api/user/index.js

@@ -2,15 +2,14 @@ const passport = require('../../../passport');
 
 const app = require('../../../../../app');
 const mailer = require('../../../../../services/mailer');
-const chai = require('chai');
-const expect = chai.expect;
 
 const SettingsService = require('../../../../../services/settings');
 const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
 
-// Setup chai.
+const chai = require('chai');
 chai.should();
 chai.use(require('chai-http'));
+const expect = chai.expect;
 
 const UsersService = require('../../../../../services/users');
 

test/server/services/assets.js

@@ -6,14 +6,12 @@ const SettingsService = require('../../../services/settings');
 
 const url = require('url');
 const chai = require('chai');
-const expect = chai.expect;
-const chaiAsPromised = require('chai-as-promised');
 
-chai.use(chaiAsPromised);
-
-// Use the chai should.
+chai.use(require('chai-as-promised'));
 chai.should();
 
+const expect = chai.expect;
+
 const settings = {id: '1', moderation: 'PRE', domains: {whitelist: ['new.test.com', 'test.com', 'override.test.com']}};
 const defaults = {url:'http://test.com'};
 

test/server/services/comments.js

@@ -8,7 +8,9 @@ const CommentsService = require('../../../services/comments');
 
 const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
 
-const expect = require('chai').use(require('chai-as-promised')).expect;
+const chai = require('chai');
+chai.use(require('chai-as-promised'));
+const expect = chai.expect;
 
 describe('services.CommentsService', () => {
   const comments = [{

test/server/services/settings.js

@@ -1,5 +1,6 @@
 const SettingsService = require('../../../services/settings');
-const expect = require('chai').expect;
+const chai = require('chai');
+const expect = chai.expect;
 
 describe('services.SettingsService', () => {
 

test/server/services/tags.js

@@ -5,7 +5,8 @@ const SettingsService = require('../../../services/settings');
 
 const CommentModel = require('../../../models/comment');
 
-const expect = require('chai').use(require('chai-as-promised')).expect;
+const chai = require('chai');
+const expect = chai.expect;
 
 describe('services.TagsService', () => {
   let comment, user;

test/server/services/tokens.js

@@ -3,10 +3,7 @@ const UsersService = require('../../../services/users');
 const SettingsService = require('../../../services/settings');
 
 const chai = require('chai');
-const chaiAsPromised = require('chai-as-promised');
-
-chai.use(chaiAsPromised);
-
+chai.use(require('chai-as-promised'));
 const expect = chai.expect;
 
 describe('services.TokensService', () => {

test/server/services/users.js

@@ -1,7 +1,8 @@
 const UsersService = require('../../../services/users');
 const SettingsService = require('../../../services/settings');
 
-const expect = require('chai').expect;
+const chai = require('chai');
+const expect = chai.expect;
 
 describe('services.UsersService', () => {
 

test/server/services/wordlist.js

@@ -1,8 +1,10 @@
-const expect = require('chai').expect;
 const Errors = require('../../../errors');
 const Wordlist = require('../../../services/wordlist');
 const SettingsService = require('../../../services/settings');
 
+const chai = require('chai');
+const expect = chai.expect;
+
 describe('services.Wordlist', () => {
 
   const wordlists = {