Use recursive-readdir to resolve test files (#451)

Author: cgewecke

package.json

@@ -35,9 +35,9 @@
     "istanbul": "^0.4.5",
     "jsonschema": "^1.2.4",
     "lodash": "^4.17.15",
-    "node-dir": "^0.1.17",
     "node-emoji": "^1.10.0",
     "pify": "^4.0.1",
+    "recursive-readdir": "^2.2.2",
     "shelljs": "^0.8.3",
     "solidity-parser-antlr": "0.4.7",
     "web3": "1.2.1",

plugins/resources/truffle.utils.js

@@ -1,8 +1,7 @@
 const PluginUI = require('./truffle.ui');
-
 const globalModules = require('global-modules');
 const TruffleProvider = require('@truffle/provider');
-const dir = require('node-dir');
+const recursive = require('recursive-readdir');
 const globby = require('globby');
 const path = require('path');
 
@@ -15,15 +14,15 @@ const path = require('path');
  * @param  {Object}   config  truffleConfig
  * @return {String[]}         list of files to pass to mocha
  */
-function getTestFilePaths(config){
+async function getTestFilePaths(config){
   let target;
   let ui = new PluginUI(config.logger.log);
 
 
   // Handle --file <path|glob> cli option (subset of tests)
   (typeof config.file === 'string')
     ? target = globby.sync([config.file])
-    : target = dir.files(config.testDir, { sync: true }) || [];
+    : target = await recursive(config.testDir);
 
   // Filter native solidity tests and warn that they're skipped
   const solregex = /.*\.(sol)$/;

plugins/truffle.plugin.js

@@ -96,7 +96,7 @@ async function plugin(config){
     );
 
     config.all = true;
-    config.test_files = truffleUtils.getTestFilePaths(config);
+    config.test_files = await truffleUtils.getTestFilePaths(config);
     config.compilers.solc.settings.optimizer.enabled = false;
 
     // Compile Instrumented Contracts

test/integration/projects/tests-folder/.solcover.js

@@ -0,0 +1,4 @@
+module.exports = {
+ "silent": false,
+ "istanbulReporter": [ "json-summary", "text"]
+}

test/integration/projects/tests-folder/buidler.config.js

@@ -0,0 +1,8 @@
+const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing");
+loadPluginFile(__dirname + "/../plugins/buidler.plugin");
+usePlugin("@nomiclabs/buidler-truffle5");
+
+module.exports={
+  defaultNetwork: "buidlerevm",
+  logger: process.env.SILENT ? { log: () => {} } : console,
+};

test/integration/projects/tests-folder/contracts/ContractA.sol

@@ -0,0 +1,17 @@
+pragma solidity ^0.5.0;
+
+
+contract ContractA {
+  uint x;
+  constructor() public {
+  }
+
+  function sendFn() public {
+    x = 5;
+  }
+
+  function callFn() public pure returns (uint){
+    uint y = 5;
+    return y;
+  }
+}

test/integration/projects/tests-folder/contracts/ContractB.sol

@@ -0,0 +1,17 @@
+pragma solidity ^0.5.0;
+
+
+contract ContractB {
+  uint x;
+  constructor() public {
+  }
+
+  function sendFn() public {
+    x = 5;
+  }
+
+  function callFn() public pure returns (uint){
+    uint y = 5;
+    return y;
+  }
+}

test/integration/projects/tests-folder/contracts/ContractC.sol

@@ -0,0 +1,17 @@
+pragma solidity ^0.5.0;
+
+
+contract ContractC {
+  uint x;
+  constructor() public {
+  }
+
+  function sendFn() public {
+    x = 5;
+  }
+
+  function callFn() public pure returns (uint){
+    uint y = 5;
+    return y;
+  }
+}

test/integration/projects/tests-folder/contracts/Migrations.sol

@@ -0,0 +1,23 @@
+pragma solidity >=0.4.21 <0.6.0;
+
+contract Migrations {
+  address public owner;
+  uint public last_completed_migration;
+
+  constructor() public {
+    owner = msg.sender;
+  }
+
+  modifier restricted() {
+    if (msg.sender == owner) _;
+  }
+
+  function setCompleted(uint completed) public restricted {
+    last_completed_migration = completed;
+  }
+
+  function upgrade(address new_address) public restricted {
+    Migrations upgraded = Migrations(new_address);
+    upgraded.setCompleted(last_completed_migration);
+  }
+}

test/integration/projects/tests-folder/test/contracta.js

@@ -0,0 +1,15 @@
+const ContractA = artifacts.require("ContractA");
+
+contract("contracta", function(accounts) {
+  let instance;
+
+  before(async () => instance = await ContractA.new())
+
+  it('sends [ @skipForCoverage ]', async function(){
+    await instance.sendFn();
+  });
+
+  it('calls [ @skipForCoverage ]', async function(){
+    await instance.callFn();
+  })
+});