Merge pull request #1137 from alco/919-iex-test-fmwk

Test framework for IEx

Author: alco

lib/elixir/lib/code.ex

@@ -190,10 +190,10 @@ defmodule Code do
   defp unpack_ast(line, forms),                            do: { :__block__, [line: line], forms }
 
   @doc """
-  Loads the given `file`. Accepts `relative_to` as an argument
-  to tell where the file is located. If the file was already
-  required/loaded, loads it again. It returns all the modules
-  defined in the file.
+  Loads the given `file`. Accepts `relative_to` as an argument to tell where
+  the file is located. If the file was already required/loaded, loads it again.
+  It returns a list of tuples { ModuleName, <<byte_code>> }, one tuple for each
+  module defined in the file.
 
   Notice that if `load_file` is invoked by different processes
   concurrently, the target file will be invoked concurrently
@@ -211,8 +211,8 @@ defmodule Code do
 
   @doc """
   Requires the given `file`. Accepts `relative_to` as an argument to tell where
-  the file is located. It returns all the modules defined in the file. If the
-  file was already required/loaded, doesn't do anything and returns nil.
+  the file is located. The return value is the same as that of `load_file`. If
+  the file was already required/loaded, doesn't do anything and returns nil.
 
   Notice that if `require_file` is invoked by different processes concurrently,
   the first process to invoke `require_file` acquires a lock and the remaining

lib/ex_unit/lib/ex_unit/callbacks.ex

@@ -29,6 +29,11 @@ defmodule ExUnit.Callbacks do
           :ok
         end
 
+        teardown context do
+          assert context[:hello] == "world"
+          :ok
+        end
+
         test "always pass" do
           assert true
         end

lib/ex_unit/lib/ex_unit/capture_io.ex

@@ -1,7 +1,6 @@
 defmodule ExUnit.CaptureIO do
   @moduledoc %B"""
   This module provides functionality to capture IO to test it.
-  The way to use this module is to import them into your module.
 
   ## Examples
 
@@ -21,16 +20,16 @@ defmodule ExUnit.CaptureIO do
 
   @doc """
   Captures IO. Returns nil in case of no output,
-  otherwise returns the binary which is captured outputs.
+  otherwise returns the binary which is the captured output.
 
   By default, capture_io replaces the group_leader (`:stdio`)
   for the current process. However, the capturing of any other
   named device like `:stderr` is also possible globally by
   giving the registered device name explicitly as argument.
 
-  When capturing of `:stdio` and the `:capture_prompt` option
-  is not `false`, this function captures a prompt, otherwise 
-  do not.
+  When capturing `:stdio` and the `:capture_prompt` option is `false`,
+  prompts (specified as arguments in IO.get* functions) are not
+  captured.
 
   A developer can set a string as an input. The default
   input is `:eof`.

lib/ex_unit/lib/ex_unit/cli_formatter.ex

@@ -213,24 +213,28 @@ defmodule ExUnit.CLIFormatter do
 
   # Print styles
 
+  defp colorize(escape, string) do
+    IO.ANSI.escape_fragment("%{#{escape}}") <> string <> IO.ANSI.escape_fragment("%{reset}")
+  end
+
   defp success(msg) do
-    IO.ANSI.escape("%{green}" <>  msg)
+    colorize("green", msg)
   end
 
   defp invalid(msg) do
-    IO.ANSI.escape("%{yellow}" <>  msg)
+    colorize("yellow", msg)
   end
 
   defp failure(msg) do
-    IO.ANSI.escape("%{red}" <>  msg)
+    colorize("red", msg)
   end
 
   defp error_info(msg) do
-    IO.ANSI.escape("%{red}     " <> msg)
+    colorize("red", "     " <> msg)
   end
 
   defp location_info(msg) do
-    IO.ANSI.escape("%{cyan}     " <> msg)
+    colorize("cyan", "     " <> msg)
   end
 
   defp stacktrace_info(msg) do

lib/iex/lib/iex.ex

@@ -205,7 +205,11 @@ defmodule IEx do
     :application.start(:iex)
   end
 
-  defp boot_config(opts) do
+  @doc """
+  Returns default config used to launch IEx. This config is also used by
+  IEx.TestFramework.
+  """
+  def boot_config(opts) do
     scope = :elixir.scope_for_eval(
       file: "iex",
       delegate_locals_to: IEx.Helpers

lib/iex/lib/iex/helpers.ex

@@ -233,7 +233,7 @@ defmodule IEx.Helpers do
   in the current IEx session.
   """
   def r do
-    Enum.map iex_reloaded, r(&1)
+    List.flatten(Enum.map(iex_reloaded, do_r(&1)))
   end
 
   @doc """
@@ -243,9 +243,16 @@ defmodule IEx.Helpers do
   are recompiled and reloaded.
   """
   def r(module) do
+    case do_r(module) do
+      mods when is_list(mods) -> { module, mods }
+      other -> other
+    end
+  end
+
+  defp do_r(module) do
     if source = source(module) do
       Process.put(:iex_reloaded, :ordsets.add_element(module, iex_reloaded))
-      { module, Code.load_file source }
+      Enum.map(Code.load_file(source), fn {name, _} -> name end)
     else
       :nosource
     end

lib/iex/lib/iex/introspection.ex

@@ -9,8 +9,7 @@ defmodule IEx.Introspection do
       { :module, _ } ->
         case module.__info__(:moduledoc) do
           { _, binary } when is_binary(binary) ->
-            # FIXME: add tests for `binary` containing ANSI escapes
-            IO.write IEx.color(:info, "# #{inspect module}\n" <> binary)
+            IO.write IEx.color(:info, "# #{inspect module}\n\n" <> binary)
           { _, _ } ->
             IO.puts IEx.color(:error, "No docs for #{inspect module} have been found")
           _ ->
@@ -148,7 +147,6 @@ defmodule IEx.Introspection do
   defp print_doc({ { fun, _ }, _line, kind, args, doc }) do
     args = Enum.map_join(args, ", ", print_doc_arg(&1))
     IO.puts IEx.color(:info, "* #{kind} #{fun}(#{args})\n")
-    # FIXME: add tests for `doc` containing ANSI escapes
     if doc, do: IO.write IEx.color(:info, doc)
   end
 

lib/iex/lib/iex/server.ex

@@ -157,7 +157,6 @@ defmodule IEx.Server do
   end
 
   defp io_put(result) do
-    # FIXME: add tests for `result` containing ANSI escapes
     IO.puts IEx.color(:eval_result, inspect(result, IEx.Options.get(:inspect)))
   end