Add setup and setup_all

bryanjos · bryanjos · commit ad8ab30601f2 · 2017-10-28T10:42:13.000-05:00
diff --git a/lib/elixir_script_test/test.ex b/lib/elixir_script_test/test.ex
@@ -2,13 +2,44 @@ defmodule ElixirScript.Test do
     @doc false
     defmacro __using__(_opts) do
       quote do
-        import unquote(__MODULE__), only: [test: 2, test: 3]
+        import unquote(__MODULE__), only: [test: 2, test: 3, setup: 1, setup: 2, setup_all: 1, setup_all: 2]
         import ExUnit.Assertions
 
         def __elixir_script_test_module__(), do: true
       end
     end
 
+    defmacro setup_all(context \\ quote(do: _), contents) do
+      do_setup(context, contents, :__elixirscript_test_setup_all)
+    end
+
+    defmacro setup(context \\ quote(do: _), contents) do
+      do_setup(context, contents, :__elixirscript_test_setup)
+    end
+
+    defp do_setup(context, contents, name) do
+      contents =
+      case contents do
+        [do: block] ->
+          quote do
+            unquote(block)
+          end
+        _ ->
+          quote do
+            try(unquote(contents))
+          end
+      end
+
+      context = Macro.escape(context)
+      contents = Macro.escape(contents, unquote: true)
+
+      quote bind_quoted: [context: context, contents: contents, name: name] do
+        def unquote(name)(unquote(context)) do
+          unquote(contents)
+        end
+      end
+    end
+
     defmacro test(message, context \\ quote(do: _), contents) do
       contents =
         case contents do
@@ -30,7 +61,7 @@ defmodule ElixirScript.Test do
       |> String.replace(" ", "_")
       |> String.replace(~r/[^A-Za-z0-9]/, "")
 
-      name = String.to_atom("__test_#{name}")
+      name = String.to_atom("__elixirscript_test_case_#{name}")
 
       quote bind_quoted: [context: context, contents: contents, message: message, name: name] do
         def unquote(name)(unquote(context)) do
@@ -56,9 +87,7 @@ defmodule ElixirScript.Test do
       |> Path.join("Elixir.*.js")
       |> Path.wildcard()
 
-      test_script_path = Path.join([:code.priv_dir(:elixir_script), "testrunner", "index.js"])
-
-      {_, exit_status} = System.cmd "node", [test_script_path] ++ js_files, into: IO.stream(:stdio, :line)
+      exit_status = node_test_runner(js_files)
 
       # Delete directory at the end
       File.rm_rf!(output)
@@ -70,4 +99,10 @@ defmodule ElixirScript.Test do
           :error
       end
     end
+
+    defp node_test_runner(js_files) do
+      test_script_path = Path.join([:code.priv_dir(:elixir_script), "testrunner", "index.js"])
+      {_, exit_status} = System.cmd "node", [test_script_path] ++ js_files, into: IO.stream(:stdio, :line)
+      exit_status
+    end
 end
diff --git a/package.json b/package.json
@@ -11,9 +11,8 @@
   },
   "scripts": {
     "lint": "eslint src/javascript/lib/**/*.js src/javascript/tests/**/*.js",
-    "lint:fix":
-      "eslint src/javascript/lib/**/*.js src/javascript/tests/**/*.js --fix",
-    "build": "rollup -c rollup.config.js",
+    "lint:fix": "eslint src/javascript/lib/**/*.js src/javascript/tests/**/*.js --fix",
+    "build": "node rollup.config.js",
     "clean": "rm -rf priv/build",
     "test": "nyc ava src/javascript/tests"
   },
@@ -24,6 +23,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "chalk": "^2.3.0",
     "erlang-types": "^1.0.1",
     "grapheme-splitter": "^1.0.2",
     "rollup-plugin-commonjs": "^8.2.1",
@@ -45,7 +45,9 @@
     "rollup-plugin-node-resolve": "^3.0.0"
   },
   "ava": {
-    "require": ["babel-register"],
+    "require": [
+      "babel-register"
+    ],
     "babel": {
       "babelrc": true
     }
diff --git a/priv/testrunner/testRunner.js b/priv/testrunner/testRunner.js
@@ -1,4 +1,5 @@
 import Colors from './colors.js';
+import Vendor from './vendor.build.js';
 
 async function start(files) {
   const results = {
@@ -17,11 +18,47 @@ async function start(files) {
   return results;
 }
 
+function runSetup(mod, name, incomingContext = new Map()) {
+  if (mod.default[name]) {
+    const result = mod.default[name](incomingContext);
+
+    return resolveContext(result, incomingContext);
+  }
+
+  return incomingContext;
+}
+
+function resolveContext(context, parentContext) {
+  if (context === Symbol.for('ok')) {
+    return parentContext;
+  } else if (context instanceof Vendor.ErlangTypes.Tuple && context.get(0) === Symbol.for('ok')) {
+    return resolveContext(context.get(1), parentContext);
+  } else if (context instanceof Map) {
+    return new Map([...parentContext, ...context]);
+  } else if (Array.isArray(context)) {
+    return mergeContextKeywordList(context, parentContext);
+  }
+
+  throw new Error('Invalid context');
+}
+
+function mergeContextKeywordList(context, parentContext) {
+  const newContext = new Map([...parentContext]);
+
+  for (const entry of context) {
+    newContext.set(entry.get(0), entry.get(1));
+  }
+
+  return newContext;
+}
+
 function runTests(mod, results) {
-  const context = [];
+  const contextSetupAll = runSetup(mod, '__elixirscript_test_setup_all');
 
   for (const key of Object.keys(mod.default)) {
-    if (key.startsWith('__test_')) {
+    const context = runSetup(mod, '__elixirscript_test_setup', contextSetupAll);
+
+    if (key.startsWith('__elixirscript_test_case')) {
       results.tests++;
       const test = mod.default[key](context);
       try {
@@ -54,7 +91,7 @@ function handleError(e, test, results, mod) {
       printErrorLine(right, 'right');
     }
   } else {
-    console.error(e.message);
+    console.log(e);
   }
 }
 
diff --git a/priv/testrunner/vendor.build.js b/priv/testrunner/vendor.build.js
diff --git a/priv/testrunner/vendor.js b/priv/testrunner/vendor.js
@@ -0,0 +1,7 @@
+import ErlangTypes from 'erlang-types';
+import Chalk from 'chalk';
+
+export default {
+  ErlangTypes,
+  Chalk,
+};
diff --git a/rollup.config.js b/rollup.config.js
@@ -1,27 +1,49 @@
-import nodeResolve from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
-import babel from 'rollup-plugin-babel';
-import minify from 'rollup-plugin-babel-minify';
+const rollup = require('rollup');
+const babel = require('rollup-plugin-babel');
+const nodeResolve = require('rollup-plugin-node-resolve');
+const commonjs = require('rollup-plugin-commonjs');
+const minify = require('rollup-plugin-babel-minify');
 
-export default {
-  input: 'src/javascript/elixir.js',
-  name: 'ElixirScript',
-  plugins: [
-    nodeResolve({
-      jsnext: true,
-      main: true,
-    }),
-    commonjs(),
-    babel({
-      babelrc: false,
-    }),
-    minify({
-      keepFnName: true,
-      keepClassName: true,
-    }),
-  ],
-  output: [
-    { file: 'priv/build/iife/ElixirScript.Core.js', format: 'iife' },
-    { file: 'priv/build/es/ElixirScript.Core.js', format: 'es', sourcemap: 'inline' },
-  ],
-};
+const plugins = [
+  nodeResolve({
+    jsnext: true,
+    main: true,
+  }),
+  commonjs(),
+  babel({
+    babelrc: false,
+  }),
+  minify({
+    keepFnName: true,
+    keepClassName: true,
+  }),
+];
+
+rollup
+  .rollup({
+    input: 'src/javascript/elixir.js',
+    output: 'priv/build/es/ElixirScript.Core.js',
+    sourcemap: 'inline',
+    format: 'es',
+    plugins,
+  })
+  .then((bundle) => {
+    bundle.write({
+      format: 'es',
+      file: 'priv/build/es/ElixirScript.Core.js',
+    });
+  });
+
+rollup
+  .rollup({
+    input: 'priv/testrunner/vendor.js',
+    output: 'priv/testrunner/vendor.build.js',
+    format: 'es',
+    plugins,
+  })
+  .then((bundle) => {
+    bundle.write({
+      format: 'es',
+      file: 'priv/testrunner/vendor.build.js',
+    });
+  });
diff --git a/test_elixir_script/integration_test.exs b/test_elixir_script/integration_test.exs
@@ -1,6 +1,10 @@
-defmodule ElixirScript.Test.Test do
+defmodule ElixirScript.Integration.Test do
   use ElixirScript.Test
 
+  setup do
+    [item: true]
+  end
+
   test "Something" do
     assert {:ok, 2} = {:ok, 1}
   end
diff --git a/yarn.lock b/yarn.lock
@@ -1264,6 +1264,14 @@ chalk@^2.1.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
+chalk@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
 chokidar@^1.4.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
