Merge pull request #5253 from trufflesuite/further-test-work

Internal improvement: Further simplify scenario tests

Author: lsqproduction

packages/truffle/test/scenarios/commands/compile.js

@@ -0,0 +1,29 @@
+const sandbox = require("../sandbox");
+const CommandRunner = require("../commandRunner");
+const fs = require("fs");
+const path = require("path");
+const { assert } = require("chai");
+const Server = require("../server");
+
+describe("truffle compile", function () {
+  let config;
+  const project = path.join(__dirname, "../../sources/toyProject");
+
+  before(async () => {
+    await Server.start();
+    config = await sandbox.create(project);
+  });
+  after(async function () {
+    await Server.stop();
+  });
+
+  it("compiles", async function () {
+    this.timeout(20000);
+    await CommandRunner.run("compile", config);
+    assert(
+      fs.existsSync(
+        path.join(config.contracts_build_directory, "Migrations.json")
+      )
+    );
+  });
+});

packages/truffle/test/scenarios/commands/console.js

@@ -69,9 +69,6 @@ describe("truffle console", () => {
         config = { working_directory: sandlot.name };
         config.logger = logger;
       });
-      after("clear working_directory", () => {
-        sandlot.removeCallback();
-      });
 
       it("displays the url hostname in the prompt", async () => {
         await CommandRunner.runInREPL({

packages/truffle/test/scenarios/commands/test.js

@@ -0,0 +1,28 @@
+const sandbox = require("../sandbox");
+const MemoryLogger = require("../MemoryLogger");
+const CommandRunner = require("../commandRunner");
+const path = require("path");
+const { assert } = require("chai");
+const Server = require("../server");
+
+describe("truffle test", function () {
+  let config;
+  const logger = new MemoryLogger();
+  const project = path.join(__dirname, "../../sources/toyProject");
+
+  before(async () => {
+    await Server.start();
+    config = await sandbox.create(project);
+    config.logger = logger;
+  });
+  after(async function () {
+    await Server.stop();
+  });
+
+  it("runs tests", async function () {
+    this.timeout(70000);
+    await CommandRunner.run("test", config);
+    const output = logger.contents();
+    assert(output.includes("1 passing"));
+  });
+});

packages/truffle/test/scenarios/contract_names/test_imports.js

@@ -12,18 +12,15 @@ describe("Contract names", function () {
   const logger = new MemoryLogger();
   const project = path.join(__dirname, "../../sources/contract_names");
 
-  before(async function () {
-    await Server.start();
-  });
-  after(async function () {
-    await Server.stop();
-  });
-
   before(async function () {
     this.timeout(10000);
     config = await sandbox.create(project);
     config.network = "development";
     config.logger = logger;
+    await Server.start();
+  });
+  after(async function () {
+    await Server.stop();
   });
 
   it("compiles if file names do not match contract names", async function () {

packages/truffle/test/scenarios/genesis_time/genesis_time_invalid.js

@@ -18,24 +18,20 @@ describe("Genesis time config for truffle test, failing tests [ @standalone ]",
   });
 
   describe("test with a bad time stamp", function () {
-    before("set up sandbox", function () {
+    before(async function () {
       this.timeout(10000);
       let project = path.join(
         __dirname,
         "../../sources/genesis_time/genesis_time_invalid"
       );
-      return sandbox.create(project).then(conf => {
-        config = conf;
-        config.network = "test";
-        config.logger = logger;
-      });
-    });
-
-    before("ensure path", async () => {
+      config = await sandbox.create(project);
+      config.network = "test";
+      config.logger = logger;
+      // create test directory
       await fs.ensureDir(config.test_directory);
     });
 
-    it("will run test and output whines about invalid date", async function () {
+    it("runs test and output whines about invalid date", async function () {
       this.timeout(90000);
       await CommandRunner.run("test", config);
       const output = logger.contents();

packages/truffle/test/scenarios/genesis_time/genesis_time_undefined.js

@@ -18,24 +18,20 @@ describe("Genesis time config for truffle test, option undefined [ @standalone ]
   });
 
   describe("test with undefined option", function () {
-    before("set up sandbox", function () {
+    before(async function () {
       this.timeout(10000);
       let project = path.join(
         __dirname,
         "../../sources/genesis_time/genesis_time_undefined"
       );
-      return sandbox.create(project).then(conf => {
-        config = conf;
-        config.network = "test";
-        config.logger = logger;
-      });
-    });
-
-    before("ensure path", async () => {
+      config = await sandbox.create(project);
+      config.network = "test";
+      config.logger = logger;
+      // create test dir
       await fs.ensureDir(config.test_directory);
     });
 
-    it("will run test and not whine about invalid date", async function () {
+    it("runs test and doesn't whine about invalid date", async function () {
       this.timeout(90000);
       await CommandRunner.run("test", config);
       const output = logger.contents();

packages/truffle/test/scenarios/genesis_time/genesis_time_valid.js

@@ -17,24 +17,20 @@ describe("Genesis time config for truffle test, passing tests [ @standalone ]",
   });
 
   describe("test with valid date", function () {
-    before("set up sandbox", function () {
+    before(async function () {
       this.timeout(10000);
       let project = path.join(
         __dirname,
         "../../sources/genesis_time/genesis_time_valid"
       );
-      return sandbox.create(project).then(conf => {
-        config = conf;
-        config.network = "test";
-        config.logger = logger;
-      });
-    });
-
-    before("ensure path", async () => {
+      config = await sandbox.create(project);
+      config.network = "test";
+      config.logger = logger;
+      // create test dir
       await fs.ensureDir(config.test_directory);
     });
 
-    it("will run test and error should be undefined", async function () {
+    it("runs test and won't error", async function () {
       this.timeout(90000);
       await CommandRunner.run("test", config);
     });

packages/truffle/test/scenarios/happy_path/happypath.js

@@ -126,16 +126,11 @@ describe("truffle migrate --describe-json", () => {
     describe("without existing migration (i.e. clean slate)", () => {
       let statuses = [];
 
-      before("before all setup", done => {
+      before(async () => {
         projectPath = path.join(__dirname, "../../sources/migrations/init");
-        sandbox
-          .create(projectPath)
-          .then(conf => {
-            config = conf;
-            config.network = "development";
-            config.logger = logger;
-          })
-          .then(done);
+        config = await sandbox.create(projectPath);
+        config.network = "development";
+        config.logger = logger;
       });
 
       it("runs the migration without throwing", async () => {