Merge pull request #3395 from trufflesuite/move-test-files

Internal improvement: Rework test files

packages/core/index.js

@@ -7,7 +7,7 @@ module.exports = {
   // TODO: update this to non-legacy the next breaking change
   contracts: require("@truffle/workflow-compile/legacy"),
   package: require("./lib/package"),
-  test: require("./lib/test"),
+  test: require("./lib/testing/Test"),
   version: pkg.version,
   ganache: require("ganache-core/public-exports")
 };

packages/core/lib/commands/test/copyArtifactsToTempDir.js

@@ -0,0 +1,31 @@
+const copyArtifactsToTempDir = async config => {
+  const { promisify } = require("util");
+  const copy = require("../../copy");
+  const fs = require("fs");
+  const OS = require("os");
+  const tmp = require("tmp");
+  tmp.setGracefulCleanup();
+
+  // Copy all the built files over to a temporary directory, because we
+  // don't want to save any tests artifacts. Only do this if the build directory
+  // exists.
+  const temporaryDirectory = tmp.dirSync({
+    unsafeCleanup: true,
+    prefix: "test-"
+  }).name;
+  try {
+    fs.statSync(config.contracts_build_directory);
+  } catch (_error) {
+    return { config, temporaryDirectory };
+  }
+
+  await promisify(copy)(config.contracts_build_directory, temporaryDirectory);
+  if (config.runnerOutputOnly !== true) {
+    config.logger.log("Using network '" + config.network + "'." + OS.EOL);
+  }
+  return { config, temporaryDirectory };
+};
+
+module.exports = {
+  copyArtifactsToTempDir
+};

packages/core/lib/commands/test/determineTestFilesToRun.js

@@ -0,0 +1,27 @@
+const determineTestFilesToRun = ({ inputFile, inputArgs = [], config }) => {
+  const path = require("path");
+  const fs = require("fs");
+  const glob = require("glob");
+  let filesToRun = [];
+
+  if (inputFile) {
+    filesToRun.push(inputFile);
+  } else if (inputArgs.length > 0) {
+    inputArgs.forEach(inputArg => filesToRun.push(inputArg));
+  }
+
+  if (filesToRun.length === 0) {
+    const directoryContents = glob.sync(
+      `${config.test_directory}${path.sep}**${path.sep}*`
+    );
+    filesToRun =
+      directoryContents.filter(item => fs.statSync(item).isFile()) || [];
+  }
+  return filesToRun.filter(file => {
+    return file.match(config.test_file_extension_regexp) !== null;
+  });
+};
+
+module.exports = {
+  determineTestFilesToRun
+};

packages/core/lib/commands/test/index.js

@@ -125,11 +125,9 @@ const command = {
   run: function (options, done) {
     const Config = require("@truffle/config");
     const { Environment, Develop } = require("@truffle/environment");
-    const {
-      copyArtifactsToTempDir,
-      determineTestFilesToRun,
-      prepareConfigAndRunTests
-    } = require("./helpers");
+    const { copyArtifactsToTempDir } = require("./copyArtifactsToTempDir");
+    const { determineTestFilesToRun } = require("./determineTestFilesToRun");
+    const { prepareConfigAndRunTests } = require("./prepareConfigAndRunTests");
 
     const config = Config.detect(options);
 

packages/core/lib/commands/test/prepareConfigAndRunTests.js

@@ -0,0 +1,17 @@
+const prepareConfigAndRunTests = ({ config, temporaryDirectory, files }) => {
+  const Artifactor = require("@truffle/artifactor");
+  const Test = require("../../testing/Test");
+  // Set a new artifactor; don't rely on the one created by Environments.
+  // TODO: Make the test artifactor configurable.
+  config.artifactor = new Artifactor(temporaryDirectory);
+
+  const testConfig = config.with({
+    test_files: files,
+    contracts_build_directory: temporaryDirectory
+  });
+  return Test.run(testConfig);
+};
+
+module.exports = {
+  prepareConfigAndRunTests
+};