Syncing with upstream. Fixing merge conflicts, converting to ES6

util/users/createUsers.js

@@ -1,6 +1,5 @@
-const mongoose = require('mongoose')
-
-const config = require('../../config')
+import mongoose from 'mongoose'
+import config from '../../config/index.js'
 
 const EMAIL = 'test@test.com'
 const PASSWORD = 'pass'
@@ -34,6 +33,6 @@ async function addUser () {
 }
 addUser()
 
-module.exports = {
+export default {
   addUser
 }

util/users/delete-all-test-users.js

@@ -1,12 +1,12 @@
-const mongoose = require('mongoose')
+import mongoose from 'mongoose'
 
 // Force test environment
 // make sure environment variable is set before this file gets called.
 // see test script in package.json.
 // process.env.KOA_ENV = 'test'
-const config = require('../../config')
+import config from '../../config/index.js'
 
-const User = require('../../src/models/users')
+import User from '../../src/models/users/js'
 
 async function deleteUsers () {
   // Connect to the Mongo Database.

util/users/getUsers.js

@@ -1,8 +1,6 @@
-const mongoose = require('mongoose')
-
-const config = require('../../config')
-
-const User = require('../../src/models/users')
+import mongoose from 'mongoose'
+import config from '../../config/index.js'
+import User from '../../src/models/users.js'
 
 async function getUsers () {
   // Connect to the Mongo Database.

util/wipe-test-db.js

@@ -4,11 +4,11 @@
 
 'use strict'
 
-const mongoose = require('mongoose')
+import mongoose from 'mongoose'
+import config from '../config/index.js'
 
 // Force test environment
 process.env.KOA_ENV = 'test'
-const config = require('../config')
 
 async function cleanDb () {
   // Connect to the Mongo Database.