Reorganize test files

.eslintrc.js

@@ -42,10 +42,7 @@ module.exports = {
         "plugin:prettier/recommended",
       ],
       rules: {
-        camelcase: [
-          "error",
-          { properties: "never", allow: ["run_tests", "test_suite_name"] },
-        ],
+        camelcase: "error",
         "no-unused-vars": ["error", { argsIgnorePattern: "^_" }],
         "prettier/prettier": "warn",
         "no-var": "error",

test/v1/Pausable.test.js

@@ -3,16 +3,16 @@ const {
   deployerAccount,
   arbitraryAccount,
   pauserAccount,
-} = require("./TokenTestUtils");
+} = require("./helpers/tokenTest");
 
 const Pausable = artifacts.require("Pausable");
 
-contract("PausableTests", (_accounts) => {
+contract("Pausable", (_accounts) => {
   let pausable;
 
   beforeEach(async () => {
-    pausable = await Pausable.new();
-    await pausable.updatePauser(pauserAccount);
+    pausable = await Pausable.new({ from: deployerAccount });
+    await pausable.updatePauser(pauserAccount, { from: deployerAccount });
   });
 
   it("constructor owner", async () => {

test/v1/ABITests.test.js → test/v1/abiHacking.test.js

@@ -1,4 +1,5 @@
 const { Transaction } = require("ethereumjs-tx");
+const wrapTests = require("./helpers/wrapTests");
 const {
   expectRevert,
   checkVariables,
@@ -9,23 +10,23 @@ const {
   arbitraryAccountPrivateKey,
   tokenOwnerPrivateKey,
   pauserAccountPrivateKey,
-} = require("./TokenTestUtils");
+} = require("./helpers/tokenTest");
 const {
   makeRawTransaction,
   sendRawTransaction,
   functionSignature,
   encodeAddress,
   encodeUint,
   msgData,
-} = require("./ABIUtils");
+} = require("./helpers/abi");
 
 // Encodes methodName, 32 byte string of 0, and address.
 function mockStringAddressEncode(methodName, address) {
   const version = encodeUint(32) + encodeUint(0); // encode 32 byte string of 0's
   return functionSignature(methodName) + version + encodeAddress(address);
 }
 
-async function run_tests(newToken, _accounts) {
+function runTests(newToken, _accounts) {
   let proxy, token;
 
   beforeEach(async () => {
@@ -280,9 +281,4 @@ async function run_tests(newToken, _accounts) {
   });
 }
 
-const testWrapper = require("./TestWrapper");
-testWrapper.execute("FiatToken_ABIHackingTests", run_tests);
-
-module.exports = {
-  run_tests,
-};
+wrapTests("FiatToken ABI hacking", runTests);

test/v1/EventsTests.js → test/v1/events.test.js

@@ -1,3 +1,4 @@
+const wrapTests = require("./helpers/wrapTests");
 const {
   FiatTokenV1,
   minterAccount,
@@ -27,11 +28,11 @@ const {
   UpgradedFiatTokenNewFields,
   checkPauseEvent,
   checkTransferEvents,
-} = require("./TokenTestUtils");
+} = require("./helpers/tokenTest");
 
 const amount = 100;
 
-async function run_tests(_newToken, _accounts) {
+function runTests(_newToken, _accounts) {
   let proxy, token;
 
   beforeEach(async () => {
@@ -197,9 +198,4 @@ async function run_tests(_newToken, _accounts) {
   });
 }
 
-const testWrapper = require("./TestWrapper");
-testWrapper.execute("FiatToken_EventTests", run_tests);
-
-module.exports = {
-  run_tests,
-};
+wrapTests("FiatToken events", runTests);

test/v1/ExtendedPositiveTests.js → test/v1/extendedPositive.test.js

@@ -1,4 +1,5 @@
 const BN = require("bn.js");
+const wrapTests = require("./helpers/wrapTests");
 const {
   checkVariables,
   arbitraryAccount,
@@ -11,11 +12,11 @@ const {
   initializeTokenWithProxy,
   UpgradedFiatToken,
   upgradeTo,
-} = require("./TokenTestUtils");
+} = require("./helpers/tokenTest");
 
 const amount = 100;
 
-async function run_tests(newToken, _accounts) {
+function runTests(newToken, _accounts) {
   let proxy, token;
 
   beforeEach(async () => {
@@ -495,9 +496,4 @@ async function run_tests(newToken, _accounts) {
   });
 }
 
-const testWrapper = require("./TestWrapper");
-testWrapper.execute("FiatToken_ExtendedPositiveTests", run_tests);
-
-module.exports = {
-  run_tests,
-};
+wrapTests("FiatToken extended positive", runTests);