move determine test contracts into own method in waterfall

7409c3aa · Iuri Matias · 3275f1b0 · 7409c3aa
Commit 7409c3aa authored Feb 02, 2018 by Iuri Matias
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 14 deletions

index.js index.js +17 -14

No files found.
--- a/index.js
+++ b/index.js
@@ -18,22 +18,25 @@ var runTestFiles = function(filepath, isDirectory, web3) {
          next(err)
        }
-        let contractsToTest = []
+        next(null, compilationResult, contracts)
-        if (isDirectory) {
+      })
-          fs.readdirSync(filepath).forEach(filename => {
+    },
-            if (filename.indexOf('_test.sol') < 0) {
+    function determineTestContractsToRun(compilationResult, contracts, next) {
-              return
+      let contractsToTest = []
-            }
+      if (isDirectory) {
-            Object.keys(compilationResult[path.basename(filename)]).forEach(contractName => {
+        fs.readdirSync(filepath).forEach(filename => {
-              contractsToTest.push(contractName)
+          if (filename.indexOf('_test.sol') < 0) {
-            })
+            return
+          }
+          Object.keys(compilationResult[path.basename(filename)]).forEach(contractName => {
+            contractsToTest.push(contractName)
          })
-        } else {
+        })
-          contractsToTest = Object.keys(compilationResult[path.basename(filepath)])
+      } else {
-        }
+        contractsToTest = Object.keys(compilationResult[path.basename(filepath)])
+      }
-        next(null, contractsToTest, contracts)
+      next(null, contractsToTest, contracts)
-      })
    },
    function runTests (contractsToTest, contracts, next) {
      var testCallback = function (result) {