diff --git a/lib/ex_unit/lib/ex_unit.ex b/lib/ex_unit/lib/ex_unit.ex index 9508282d7fd..8ba9379b96a 100644 --- a/lib/ex_unit/lib/ex_unit.ex +++ b/lib/ex_unit/lib/ex_unit.ex @@ -275,7 +275,7 @@ defmodule ExUnit do * `:exit_status` - specifies an alternate exit status to use when the test suite fails. Defaults to 2; - * `:failures_manifest_file` - specifies a path to the file used to store failures + * `:failures_manifest_path` - specifies a path to the file used to store failures between runs; * `:formatters` - the formatters that will print results, diff --git a/lib/ex_unit/lib/ex_unit/runner_stats.ex b/lib/ex_unit/lib/ex_unit/runner_stats.ex index 7d08b7ffd0c..8d8dda9d8d7 100644 --- a/lib/ex_unit/lib/ex_unit/runner_stats.ex +++ b/lib/ex_unit/lib/ex_unit/runner_stats.ex @@ -36,7 +36,7 @@ defmodule ExUnit.RunnerStats do failures: 0, skipped: 0, excluded: 0, - failures_manifest_file: opts[:failures_manifest_file], + failures_manifest_path: opts[:failures_manifest_path], failures_manifest: FailuresManifest.new(), failure_counter: 0, pids: [] @@ -69,13 +69,13 @@ defmodule ExUnit.RunnerStats do {:noreply, state} end - def handle_cast({:suite_started, _opts}, %{failures_manifest_file: file} = state) + def handle_cast({:suite_started, _opts}, %{failures_manifest_path: file} = state) when is_binary(file) do state = %{state | failures_manifest: FailuresManifest.read(file)} {:noreply, state} end - def handle_cast({:suite_finished, _}, %{failures_manifest_file: file} = state) + def handle_cast({:suite_finished, _}, %{failures_manifest_path: file} = state) when is_binary(file) do FailuresManifest.write!(state.failures_manifest, file) {:noreply, state} diff --git a/lib/ex_unit/test/ex_unit/runner_stats_test.exs b/lib/ex_unit/test/ex_unit/runner_stats_test.exs index bed956e942e..5ac99d93b0f 100644 --- a/lib/ex_unit/test/ex_unit/runner_stats_test.exs +++ b/lib/ex_unit/test/ex_unit/runner_stats_test.exs @@ -5,7 +5,7 @@ defmodule ExUnit.RunnerStatsTest do alias ExUnit.{FailuresManifest, RunnerStats} - @failures_manifest_file "ex_unit_failures_manifest.elixir" + @failures_manifest_path "ex_unit_failures_manifest.elixir" describe "stats tracking" do test "counts total, failures, skipped, and excluded tests" do @@ -111,7 +111,7 @@ defmodule ExUnit.RunnerStatsTest do end end - defp simulate_suite(opts \\ [failures_manifest_file: @failures_manifest_file], fun) do + defp simulate_suite(opts \\ [failures_manifest_path: @failures_manifest_path], fun) do {:ok, pid} = GenServer.start_link(RunnerStats, opts) GenServer.cast(pid, {:suite_started, opts}) @@ -164,6 +164,6 @@ defmodule ExUnit.RunnerStatsTest do defp state_for(:excluded), do: {:excluded, "reason"} defp read_failures_manifest do - FailuresManifest.read(@failures_manifest_file) + FailuresManifest.read(@failures_manifest_path) end end diff --git a/lib/mix/lib/mix/tasks/test.ex b/lib/mix/lib/mix/tasks/test.ex index 2e4ca729789..f540b0ebd10 100644 --- a/lib/mix/lib/mix/tasks/test.ex +++ b/lib/mix/lib/mix/tasks/test.ex @@ -691,7 +691,7 @@ defmodule Mix.Tasks.Test do :colors, :slowest, :slowest_modules, - :failures_manifest_file, + :failures_manifest_path, :only_test_ids, :test_location_relative_path, :exit_status, @@ -776,11 +776,11 @@ defmodule Mix.Tasks.Test do opts = Keyword.put_new( opts, - :failures_manifest_file, + :failures_manifest_path, Path.join(Mix.Project.manifest_path(), @manifest_file_name) ) - manifest_file = Keyword.get(opts, :failures_manifest_file) + manifest_file = Keyword.get(opts, :failures_manifest_path) if opts[:failed] do if opts[:stale] do diff --git a/lib/mix/test/mix/tasks/test_test.exs b/lib/mix/test/mix/tasks/test_test.exs index ae179b87c05..5c10e60be2e 100644 --- a/lib/mix/test/mix/tasks/test_test.exs +++ b/lib/mix/test/mix/tasks/test_test.exs @@ -40,18 +40,18 @@ defmodule Mix.Tasks.TestTest do assert ex_unit_opts([]) == [ autorun: false, exit_status: 2, - failures_manifest_file: + failures_manifest_path: Path.join(Mix.Project.manifest_path(), ".mix_test_failures") ] end - test "respect failures_manifest_file option" do + test "respect failures_manifest_path option" do custom_manifest_file = Path.join(Mix.Project.manifest_path(), ".mix_test_failures_custom") - assert ex_unit_opts(failures_manifest_file: custom_manifest_file) == [ + assert ex_unit_opts(failures_manifest_path: custom_manifest_file) == [ autorun: false, exit_status: 2, - failures_manifest_file: custom_manifest_file + failures_manifest_path: custom_manifest_file ] end @@ -63,7 +63,7 @@ defmodule Mix.Tasks.TestTest do defp ex_unit_opts_from_given(passed) do passed |> ex_unit_opts() - |> Keyword.drop([:failures_manifest_file, :autorun, :exit_status]) + |> Keyword.drop([:failures_manifest_path, :autorun, :exit_status]) end end