✅ update combined test

Author: 59naga

package.json

@@ -13,7 +13,7 @@
     "globby": "^8.0.1"
   },
   "peerDependencies": {
-    "eastern": "^1.0.3"
+    "eastern": "^2.0.0-pre"
   },
   "scripts": {
     "start": "abby format, test --watch \"{./,src,test}/**/*.mjs\"",
@@ -25,7 +25,7 @@
     "abigail": "^1.9.5",
     "assert-diff": "^2.0.3",
     "delay": "^3.0.0",
-    "eastern": "^1.0.3",
+    "eastern": "^2.0.0-pre",
     "prettier": "^1.14.2"
   },
   "repository": {

src/index.mjs

@@ -5,8 +5,7 @@ import chopsticks from "chopsticks";
 import globby from "globby";
 import { resolve } from "url";
 
-import Reporter from "eastern/src/reporter";
-import Describe from "eastern/src/describe";
+import root from "eastern/src/register";
 import usage from "./usage";
 
 process.on("unhandledRejection", function(error, promise) {
@@ -32,26 +31,15 @@ process.on("unhandledRejection", function(error, promise) {
   const globs = args._.length ? args._ : ["test.mjs", "test/**/*.mjs"];
   const paths = await globby(globs);
 
-  const reporter = new Reporter();
-  const root = new Describe(null, { reporter, immediate: false });
-
-  global.spec = root.block;
-  global.it = root.block;
-  global.describe = root.block.describe;
-
   await Promise.each(paths, path => {
     return import(new URL(path, new URL(`file://${process.cwd()}/`)));
   });
 
-  console.log("");
-  root.evaluateBlock();
+  const { default: Reporter } = await import("eastern/src/reporters/spec");
 
-  await root.finish;
-  if (!reporter.isComplete(root.count())) {
-    reporter.outputResult();
-    reporter.outputFailures();
+  const reporter = new Reporter(process);
+  await root.evaluate(reporter);
+  if (!reporter.isComplete()) {
     process.exit(1);
   }
-  reporter.outputResult();
-  console.log("");
 })();

test/mixin/expected.mjs

@@ -6,30 +6,30 @@ export const stdout = `
     -  1-2
     -  1-notonly-1
   1-beforeEach
-    ✓  1-only-1 (ELAPSED ms)
   1-afterEach
+    ✓  1-only-1 (ELAPSED ms)
   1-beforeEach
-    ✓  1-only-2 (ELAPSED ms)
   1-afterEach
-    2
+    ✓  1-only-2 (ELAPSED ms)
+    -  2
     3
       3-before
       -  3-1
       -  3-2
       -  3-notonly-1
       3-beforeEach
-      ✓  3-only-1 (ELAPSED ms)
       3-afterEach
+      ✓  3-only-1 (ELAPSED ms)
       3-beforeEach
-      ✓  3-only-2 (ELAPSED ms)
       3-afterEach
-      4
+      ✓  3-only-2 (ELAPSED ms)
+      -  4
       5
         -  5
       3-after
   1-after
 
   4 passing (ELAPSED ms)
-  7 pending
+  9 pending
 `;
 export const stderr = ``;

test/mixin/index.mjs

@@ -1,16 +1,17 @@
 import delay from "delay";
 
-describe("1", ({ before, beforeEach, afterEach, after, it, describe }) => {
-  before(() => {
+setOptions({ concurrency: 1 });
+describe("1", (it, describe) => {
+  it.before(() => {
     console.log("  1-before");
   });
-  beforeEach(() => {
+  it.beforeEach(() => {
     console.log("  1-beforeEach");
   });
-  afterEach(() => {
+  it.afterEach(() => {
     console.log("  1-afterEach");
   });
-  after(() => {
+  it.after(() => {
     console.log("  1-after");
   });
 
@@ -25,17 +26,17 @@ describe("1", ({ before, beforeEach, afterEach, after, it, describe }) => {
   });
 
   describe("2");
-  describe("3", ({ before, beforeEach, afterEach, after, it, describe }) => {
-    before(() => {
+  describe("3", (it, describe) => {
+    it.before(() => {
       console.log("      3-before");
     });
-    beforeEach(() => {
+    it.beforeEach(() => {
       console.log("      3-beforeEach");
     });
-    afterEach(() => {
+    it.afterEach(() => {
       console.log("      3-afterEach");
     });
-    after(() => {
+    it.after(() => {
       console.log("      3-after");
     });
 

yarn.lock

@@ -334,13 +334,13 @@ dreamopt@~0.6.0:
   dependencies:
     wordwrap ">=0.0.2"
 
-eastern@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/eastern/-/eastern-1.0.3.tgz#67ac679c90616d6a1280399d1e889b6d24a41134"
+eastern@^2.0.0-pre:
+  version "2.0.0-pre"
+  resolved "https://registry.yarnpkg.com/eastern/-/eastern-2.0.0-pre.tgz#6bd24098aefb349862af18dd1def588a4a598337"
   dependencies:
     bluebird "^3.5.1"
     chalk "^2.4.1"
-    exit-hook "^2.0.0"
+    throat "^4.1.0"
 
 es5-ext@0.8.x:
   version "0.8.2"
@@ -350,10 +350,6 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-exit-hook@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-2.0.0.tgz#b89f6f69b7d080efc2807c66a85957722637db92"
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -999,6 +995,10 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
+throat@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"