misc, fix client tests

test/common/count.js

@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-const count = require('../../website/common/script/count');
+import * as count from '../../website/common/script/count';
 
 describe('count', () => {
   describe('beastMasterProgress', () => {

test/common/test_helper.js

@@ -1,4 +1,4 @@
-/* eslint-disable prefer-template, no-shadow, func-names */
+/* eslint-disable prefer-template, no-shadow, func-names, import/no-commonjs */
 
 const expect = require('expect.js');
 

test/helpers/api-integration/external-server.js

@@ -1,7 +1,6 @@
-
-const express = require('express');
-const uuid = require('uuid');
-const bodyParser = require('body-parser');
+import express from 'express';
+import uuid from 'uuid';
+import bodyParser from 'body-parser';
 
 const app = express();
 const server = require('http').createServer(app);
@@ -62,7 +61,7 @@ function getWebhookData (id) {
   return webhookData[id].pop();
 }
 
-module.exports = {
+export default {
   start,
   close,
   getWebhookData,

test/helpers/content.helper.js

@@ -1,7 +1,8 @@
 import i18n from '../../website/common/script/i18n';
+import './globals.helper';
+import { translations } from '../../website/server/libs/i18n';
 
-require('./globals.helper');
-i18n.translations = require('../../website/server/libs/i18n').translations;
+i18n.translations = translations;
 
 export const STRING_ERROR_MSG = /^Error processing the string ".*". Please see Help > Report a Bug.$/;
 export const STRING_DOES_NOT_EXIST_MSG = /^String '.*' not found.$/;

test/helpers/globals.helper.js

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-commonjs */
 /* eslint-disable no-undef */
 /* eslint-disable global-require */
 /* eslint-disable no-process-env */

test/mocha.opts

@@ -3,5 +3,5 @@
 --timeout 8000
 --check-leaks
 --require @babel/register
---require ./test/helpers/globals.helper
+--require ./globals.helper.js
 --exit