cleanup test output. improve coverage

lib/mix/tasks/sugar/gen/controller.ex

@@ -31,12 +31,13 @@ defmodule Mix.Tasks.Sugar.Gen.Controller do
   defp do_create_file(name, opts) do
     module = camelize String.Chars.to_string(Mix.Project.config[:app])
     name = camelize name
+    path = "lib/#{underscore name}"
 
     assigns = [
       app: Mix.Project.config[:app],
       module: module,
       name: name,
-      path: "lib/#{underscore module}"
+      path: path
     ] |> Keyword.merge opts
     assigns = assigns |> Keyword.merge([name: camelize(assigns[:name])])
 

lib/mix/tasks/sugar/gen/model.ex

@@ -30,13 +30,14 @@ defmodule Mix.Tasks.Sugar.Gen.Model do
 
   defp do_create_files(name, opts) do
     module = camelize String.Chars.to_string(Mix.Project.config[:app])
+    path = "lib/#{underscore name}"
 
     assigns = [
       app: Mix.Project.config[:app],
       module: module,
       name: camelize(name),
       table_name: name,
-      path: "lib/#{underscore module}"
+      path: path
     ] |> Keyword.merge opts
 
     Mix.Tasks.Ecto.Gen.Migration.run ["#{assigns[:module]}.Repos.Main", "create_#{name}"]

lib/mix/tasks/sugar/gen/router.ex

@@ -25,11 +25,12 @@ defmodule Mix.Tasks.Sugar.Gen.Router do
 
   defp do_create_file(opts) do
     module = camelize String.Chars.to_string(Mix.Project.config[:app])
+    path = "lib/#{underscore module}"
 
     assigns = [
       app: Mix.Project.config[:app],
       module: module,
-      path: "lib/#{underscore module}"
+      path: path
     ] |> Keyword.merge opts
 
     create_file "#{assigns[:path]}/router.ex", router_template(assigns)

lib/mix/tasks/sugar/gen/view.ex

@@ -32,12 +32,13 @@ defmodule Mix.Tasks.Sugar.Gen.View do
   defp do_create_file(name, opts) do
     module = camelize String.Chars.to_string(Mix.Project.config[:app])
     name = camelize name
+    path = "lib/#{underscore name}"
 
     assigns = [
       app: Mix.Project.config[:app],
       module: module,
       name: name,
-      path: "lib/#{underscore module}"
+      path: path
     ] |> Keyword.merge opts
 
     case opts[:type] do

lib/mix/tasks/sugar/init.ex

@@ -24,11 +24,12 @@ defmodule Mix.Tasks.Sugar.Init do
 
   defp do_init(opts) do
     name = camelize String.Chars.to_string(Mix.Project.config[:app])
+    path = "lib/#{underscore name}"
 
     assigns = [
       app: Mix.Project.config[:app],
       module: name,
-      path: "lib/#{underscore name}",
+      path: path,
       priv_path: "priv"
     ] |> Keyword.merge opts
 
@@ -37,7 +38,6 @@ defmodule Mix.Tasks.Sugar.Init do
     create_directory "#{assigns[:priv_path]}/static"
 
     # Support files
-    Mix.Tasks.Sugar.Gen.Config.run_detached assigns
     Mix.Tasks.Sugar.Gen.Router.run_detached assigns
 
     # Controllers

lib/mix/tasks/sugar/scaffold.ex

@@ -26,10 +26,11 @@ defmodule Mix.Tasks.Sugar.Scaffold do
   end
 
   defp do_scaffold(name, opts) do
+    path = "lib/#{underscore name}"
     assigns = [
       app: Mix.Project.config[:app],
       module: name,
-      path: "lib/#{underscore name}",
+      path: path,
       priv_path: "priv"
     ] |> Keyword.merge opts
 

lib/sugar/controller.ex

@@ -155,23 +155,11 @@ defmodule Sugar.Controller do
   end
 
   @doc """
-  Sends a normal response. Automatically renders a template based on
-  the current controller and action names.
+  Sends a normal response. 
 
-  ## Arguments
-  * `conn` - `Plug.Conn`
-
-  ## Returns
-
-  `Plug.Conn`
-  """
-  def render(conn) do
-    template = build_template_key(conn)
-    render_view(conn, template, [], [])
-  end
-
-  @doc """
-  Sends a normal response.
+  Automatically renders a template based on the
+  current controller and action names when no
+  template is passed.
 
   ## Arguments
 
@@ -184,12 +172,16 @@ defmodule Sugar.Controller do
 
   `Plug.Conn`
   """
-  def render(conn, template, assigns \\ [], opts \\ [])
+  def render(conn, template \\ nil, assigns \\ [], opts \\ [])
   def render(conn, template, assigns, opts) when is_atom(template)
                                               or is_binary(template) do
     template = build_template_key(conn, template)
     render_view(conn, template, assigns, opts)
   end
+  def render(conn, assigns, opts, _) when is_list(assigns) do
+    template = build_template_key(conn)
+    render_view(conn, template, assigns, opts)
+  end
 
   defp render_view(conn, template_key, assigns, opts) do
     opts = [status: 200] |> Keyword.merge opts

test/fixtures/templates/index.html.eex

@@ -0,0 +1 @@
+<%= @title %>

test/fixtures/view_finder/index.html.eex

@@ -0,0 +1 @@
+<%= @title %>

test/mix/tasks/server_test.exs

@@ -1,13 +1,18 @@
 defmodule Mix.Tasks.ServerTest do
   use ExUnit.Case
+  import ExUnit.CaptureIO
 
   test "run/1 with port" do
     args = ["--port=8080"]
-    Mix.Tasks.Server.run(args)
+    capture_io(fn ->
+      Mix.Tasks.Server.run(args)
+    end)
   end
 
   test "run/1 without port" do
     args = []
-    Mix.Tasks.Server.run(args)
+    capture_io(fn ->
+      Mix.Tasks.Server.run(args)
+    end)
   end
 end

test/mix/tasks/sugar/gen/controller_test.exs

@@ -1,21 +1,26 @@
 defmodule Mix.Tasks.Sugar.Gen.ControllerTest do
   use ExUnit.Case, async: true
+  import ExUnit.CaptureIO
 
   test "run_detached/1" do
     assigns = [
       app: :test_app,
       module: "TestApp",
       path: "test/fixtures"
     ]
-    Mix.Tasks.Sugar.Gen.Controller.run_detached(assigns ++ [name: "main"])
+    capture_io(fn ->
+      Mix.Tasks.Sugar.Gen.Controller.run_detached(assigns ++ [name: "main"])
+    end)
 
     assert File.exists?("test/fixtures/controllers/main.ex") === true
     File.rm_rf! "test/fixtures/controllers"
   end
 
   test "run/1 with proper name" do
     args = ["main", "--path=test/fixtures"]
-    Mix.Tasks.Sugar.Gen.Controller.run(args)
+    capture_io(fn ->
+      Mix.Tasks.Sugar.Gen.Controller.run(args)
+    end)
 
     assert File.exists?("test/fixtures/controllers/main.ex") === true
     File.rm_rf! "test/fixtures/controllers"

test/mix/tasks/sugar/gen/model_test.exs

@@ -1,13 +1,16 @@
 defmodule Mix.Tasks.Sugar.Gen.ModelTest do
   use ExUnit.Case, async: true
+  import ExUnit.CaptureIO
 
   test "run_detached/1" do
     assigns = [
       app: :test_app,
       module: "Mix.Tasks.Sugar.Gen.ModelTest",
       path: "test/fixtures"
     ]
-    Mix.Tasks.Sugar.Gen.Model.run_detached(assigns ++ [name: "main"])
+    capture_io(fn ->
+      Mix.Tasks.Sugar.Gen.Model.run_detached(assigns ++ [name: "main"])
+    end)
 
     assert File.exists?("test/fixtures/models/main.ex") === true
     assert File.exists?("test/fixtures/queries/main.ex") === true
@@ -16,7 +19,9 @@ defmodule Mix.Tasks.Sugar.Gen.ModelTest do
 
   test "run/1 with proper name" do
     args = ["main", "--path=test/fixtures", "--module=Mix.Tasks.Sugar.Gen.ModelTest"]
-    Mix.Tasks.Sugar.Gen.Model.run(args)
+    capture_io(fn ->
+      Mix.Tasks.Sugar.Gen.Model.run(args)
+    end)
 
     assert File.exists?("test/fixtures/models/main.ex") === true
     assert File.exists?("test/fixtures/queries/main.ex") === true

test/mix/tasks/sugar/gen/router_test.exs

@@ -1,13 +1,16 @@
 defmodule Mix.Tasks.Sugar.Gen.RouterTest do
   use ExUnit.Case, async: true
+  import ExUnit.CaptureIO
 
   test "run_detached/1" do
     assigns = [
       app: :test_app,
       module: "TestApp",
       path: "test/fixtures"
     ]
-    Mix.Tasks.Sugar.Gen.Router.run_detached(assigns)
+    capture_io(fn ->
+      Mix.Tasks.Sugar.Gen.Router.run_detached(assigns)
+    end)
     expected_path = "test/fixtures/router.ex"
 
     assert File.exists?(expected_path) === true
@@ -16,7 +19,9 @@ defmodule Mix.Tasks.Sugar.Gen.RouterTest do
 
   test "run/1" do
     args = ["--path=test/fixtures"]
-    Mix.Tasks.Sugar.Gen.Router.run(args)
+    capture_io(fn ->
+      Mix.Tasks.Sugar.Gen.Router.run(args)
+    end)
     expected_path = "test/fixtures/router.ex"
 
     assert File.exists?(expected_path) === true

test/mix/tasks/sugar/gen/view_test.exs

@@ -1,45 +1,56 @@
 defmodule Mix.Tasks.Sugar.Gen.ViewTest do
   use ExUnit.Case, async: true
+  import ExUnit.CaptureIO
 
   test "run_detached/1" do
     assigns = [
       app: :test_app,
       module: "TestApp",
       path: "test/fixtures"
     ]
-    Mix.Tasks.Sugar.Gen.View.run_detached(assigns ++ [name: "main"])
+    capture_io(fn ->
+      Mix.Tasks.Sugar.Gen.View.run_detached(assigns ++ [name: "main"])
+    end)
 
     assert File.exists?("test/fixtures/views/main.html.eex") === true
     File.rm_rf! "test/fixtures/views"
   end
 
   test "run/1 with proper name and default type" do
     args = ["main", "--path=test/fixtures"]
-    Mix.Tasks.Sugar.Gen.View.run(args)
+    capture_io(fn ->
+      Mix.Tasks.Sugar.Gen.View.run(args)
+    end)
 
     assert File.exists?("test/fixtures/views/main.html.eex") === true
     File.rm_rf! "test/fixtures/views"
   end
 
   test "run/1 with proper name and eex type" do
     args = ["main", "--path=test/fixtures"]
-    Mix.Tasks.Sugar.Gen.View.run(args)
+    capture_io(fn ->
+      Mix.Tasks.Sugar.Gen.View.run(args)
+    end)
 
     assert File.exists?("test/fixtures/views/main.html.eex") === true
     File.rm_rf! "test/fixtures/views"
   end
 
   test "run/1 with proper name and dtl type" do
     args = ["main", "--path=test/fixtures", "--type=dtl"]
-    Mix.Tasks.Sugar.Gen.View.run(args)
+    capture_io(fn ->
+      Mix.Tasks.Sugar.Gen.View.run(args)
+    end)
 
     assert File.exists?("test/fixtures/views/main.html.dtl") === true
     File.rm_rf! "test/fixtures/views"
   end
 
   test "run/1 with proper name and haml type" do
     args = ["main", "--path=test/fixtures", "--type=haml"]
-    Mix.Tasks.Sugar.Gen.View.run(args)
+    capture_io(fn ->
+      Mix.Tasks.Sugar.Gen.View.run(args)
+    end)
 
     assert File.exists?("test/fixtures/views/main.html.haml") === true
     File.rm_rf! "test/fixtures/views"