Update tests to work with latest changes

Author: justinkchen

test/helpers/StandardTokenMock.sol

@@ -1,15 +1,26 @@
-pragma solidity ^0.4.11;
+pragma solidity 0.4.18;
 
 
-import '../../contracts/lib/StandardToken.sol';
+import "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol";
 
 
 // mock class using BasicToken
 contract StandardTokenMock is StandardToken {
+  string public name;
+  string public symbol;
+  uint256 public totalSupply;
 
-  function StandardTokenMock(address initialAccount, uint256 initialBalance) {
+  function StandardTokenMock(
+    address initialAccount,
+    uint256 initialBalance,
+    string _name,
+    string _symbol)
+    public
+  {
     balances[initialAccount] = initialBalance;
     totalSupply = initialBalance;
+    name = _name;
+    symbol = _symbol;
   }
 
-}
+}

test/helpers/expectedException.js

@@ -1,35 +1,50 @@
-module.exports = function expectedExceptionPromise(action, gasToUse) {
-    return new Promise(function (resolve, reject) {
-            try {
-                resolve(action());
-            } catch(e) {
-                reject(e);
-            }
-        })
-        .then(function (txObj) {
-            return typeof txn === "string" 
-                ? web3.eth.getTransactionReceiptMined(txObj) // regular tx hash
-                : typeof txObj.receipt !== "undefined"
-                    ? txObj.receipt // truffle-contract function call
-                    : typeof txObj.transactionHash === "string"
-                        ? web3.eth.getTransactionReceiptMined(txObj.transactionHash) // deployment
-                        : txObj; // Unknown last case
-        })
-        .then(function (receipt) {
-            console.log('Receipt', receipt);
+"use strict";
 
-            // We are in Geth or the tx wrongly passed
-            assert.equal(receipt.gasUsed, gasToUse, "should have used all the gas");
-        })
-        .catch(function (e) {
-            if ((e + "").indexOf("invalid JUMP") > -1 ||
-                    (e + "").indexOf("out of gas") > -1 ||
-                    (e + "").indexOf("invalid opcode") > -1) {
-                // We are in TestRPC
-            } else if ((e + "").indexOf("please check your gas amount") > -1) {
-                // We are in Geth for a deployment
-            } else {
-                throw e;
-            }
-        });
-    };
+/**
+ * @param {!Function.<!Promise>} action.
+ * @param {!Number | !string | !BigNumber} gasToUse.
+ * @returns {!Promise} which throws unless it hit a valid error.
+ */
+module.exports = function expectedExceptionPromise(action, gasToUse) {
+  return new Promise(function (resolve, reject) {
+      try {
+        resolve(action());
+      } catch(e) {
+        reject(e);
+      }
+    })
+    .then(function (txObj) {
+      return typeof txn === "string"
+        ? web3.eth.getTransactionReceiptMined(txObj) // regular tx hash
+        : typeof txObj.receipt !== "undefined"
+          ? txObj.receipt // truffle-contract function call
+          : typeof txObj.transactionHash === "string"
+            ? web3.eth.getTransactionReceiptMined(txObj.transactionHash) // deployment
+            : txObj; // Unknown last case
+    })
+    .then(
+      function (receipt) {
+        console.log("Receipt: " + receipt);
+        // We are in Geth
+        if (typeof receipt.status !== "undefined") {
+          // Byzantium
+          assert.include(["0x0", "0x00"], receipt.status, "should have reverted");
+        } else {
+          // Pre Byzantium
+          assert.equal(receipt.gasUsed, gasToUse, "should have used all the gas");
+        }
+      },
+      function (e) {
+        if ((e + "").indexOf("invalid JUMP") > -1 ||
+            (e + "").indexOf("out of gas") > -1 ||
+            (e + "").indexOf("invalid opcode") > -1 ||
+            (e + "").indexOf("revert") > -1) {
+          // We are in TestRPC
+        } else if ((e + "").indexOf("please check your gas amount") > -1) {
+          // We are in Geth for a deployment
+        } else {
+          throw e;
+        }
+      }
+    );
+  };

test/helpers/getTransactionReceiptMined.js

@@ -22,4 +22,4 @@ module.exports = function getTransactionReceiptMined(txHash, interval) {
     } else {
         throw new Error("Invalid Type: " + txHash);
     }
-};
+};