update test assert

ckochx · Sep 21, 2021 · cb5eff2 · cb5eff2
1 parent afb8b51
commit cb5eff2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/lib/ex_factor.ex b/lib/ex_factor.ex
@@ -26,8 +26,9 @@ defmodule ExFactor do
       |> Keyword.put_new(:source_path, path(source_module))
 
     emplace = Extractor.emplace(opts)
-    remove = Remover.remove(opts)
     changes = Changer.change(opts)
+    # remove should be last (before format)
+    remove = Remover.remove(opts)
     {emplace, remove, changes}
     |> IO.inspect(label: "refactor all changes")
   end

diff --git a/lib/ex_factor/extractor.ex b/lib/ex_factor/extractor.ex
@@ -76,8 +76,6 @@ defmodule ExFactor.Extractor do
     }
   end
 
-  defp write_file(target_path, contents, _module, _dry_run) do
-    File.write(target_path, contents, [:write])
   defp write_file(target_path, contents, module, _dry_run) do
     _ = File.write(target_path, contents, [:write])
     %{

diff --git a/lib/ex_factor/remover.ex b/lib/ex_factor/remover.ex
@@ -2,8 +2,6 @@ defmodule ExFactor.Remover do
   @moduledoc """
   Documentation for `ExFactor.Remover`.
   """
-alias ExFactor.Util
-
   alias ExFactor.Parser
 
   @doc """
@@ -69,7 +67,7 @@ alias ExFactor.Util
     File.write(path, contents, [:write])
   end
 
-  defp path(module), do: Util.path(module)
+  defp path(module), do: ExFactor.path(module)
 
   defp function_name(name) when is_binary(name) do
     String.to_atom(name)

diff --git a/test/ex_factor_test.exs b/test/ex_factor_test.exs
@@ -49,7 +49,7 @@ defmodule ExFactorTest do
         arity: 1
       ]
 
-      results = ExFactor.refactor(opts)
+      {_, _, _} = _results = ExFactor.refactor(opts)
 
       file = File.read!("lib/ex_factor/tmp/target_module.ex")
       assert file =~ "def(refactor1(arg1)) do"
@@ -61,7 +61,7 @@ defmodule ExFactorTest do
       # |> IO.inspect(label: "")
       refute file =~ "def refactor1(arg1) do"
       refute file =~ "def refactor1([]) do"
-      assert results == {:ok, :ok}
+      # assert results == {:ok, :ok}
     end
 
     test "it returns the results of the dry_run changes" do
@@ -106,7 +106,7 @@ defmodule ExFactorTest do
         dry_run: true
       ]
 
-      {_extract_contents, _remove_contents} = ExFactor.refactor(opts)
+      {_extract_results, _remove_results, _change_results} = ExFactor.refactor(opts)
 
       # assert that the original files are unchanged
       file = File.read!("lib/ex_factor/tmp/target_module.ex")