Refactor dry_run test formatting

Author: Nezteb

lib/ex_unit/lib/ex_unit/cli_formatter.ex

@@ -36,6 +36,8 @@ defmodule ExUnit.CLIFormatter do
   end
 
   def handle_cast({:suite_started, _opts}, config) do
+    if config.dry_run, do: IO.puts(extra_info("Tests that would be executed:", config))
+
     {:noreply, config}
   end
 
@@ -157,7 +159,6 @@ defmodule ExUnit.CLIFormatter do
 
   def handle_cast({:module_finished, %ExUnit.TestModule{state: nil} = module}, config) do
     if config.dry_run do
-      IO.puts("Test dry run:")
       file_path = Path.relative_to_cwd(module.file)
 
       Enum.each(module.tests, fn test ->
@@ -366,11 +367,7 @@ defmodule ExUnit.CLIFormatter do
       )
       |> if_true(
         config.excluded_counter > 0,
-        &(&1 <> ", (#{config.excluded_counter} excluded)")
-      )
-      |> if_true(
-        config.dry_run == true,
-        &(&1 <> " (dry run)")
+        &(&1 <> " (#{config.excluded_counter} excluded)")
       )
 
     cond do
@@ -467,6 +464,10 @@ defmodule ExUnit.CLIFormatter do
     colorize(:failure, msg, config)
   end
 
+  defp extra_info(msg, config) do
+    colorize(:extra_info, msg, config)
+  end
+
   # Diff formatting
 
   defp formatter(:diff_enabled?, _, %{colors: colors}),

lib/mix/test/mix/tasks/test_test.exs

@@ -719,8 +719,8 @@ defmodule Mix.Tasks.TestTest do
   describe "--dry-run" do
     test "works with --stale" do
       in_fixture("test_stale", fn ->
-        File.write!("test/dry_run_test_stale.exs", """
-        defmodule DryRunTest do
+        File.write!("test/dry_run_one_test_stale.exs", """
+        defmodule DryRunOneTest do
           use ExUnit.Case
 
           test "new test" do
@@ -729,11 +729,29 @@ defmodule Mix.Tasks.TestTest do
         end
         """)
 
+        File.write!("test/dry_run_two_test_stale.exs", """
+        defmodule DryRunTwoTest do
+          use ExUnit.Case
+
+          @tag :skip
+          test "skipped test" do
+            assert true
+          end
+        end
+        """)
+
         output = mix(["test", "--dry-run", "--stale"])
 
-        assert output =~ "Test dry run:"
-        assert output =~ "test/dry_run_test_stale.exs:4"
-        assert output =~ "0 tests, 0 failures (dry run)"
+        assert output =~ "Tests that would be executed:"
+        assert output =~ "test/a_test_stale.exs:4"
+        assert output =~ "test/b_test_stale.exs:4"
+        assert output =~ "test/dry_run_one_test_stale.exs:4"
+        refute output =~ "test/dry_run_two_test_stale.exs:5"
+        assert output =~ "1 test, 0 failures, 1 skipped"
+
+        # Tests are still marked as stale
+        output = mix(["test", "--dry-run", "--stale"])
+        assert output =~ "1 test, 0 failures, 1 skipped"
       end)
     end
 
@@ -742,9 +760,14 @@ defmodule Mix.Tasks.TestTest do
         _initial_run = mix(["test"])
         output = mix(["test", "--dry-run", "--failed"])
 
-        assert output =~ "Test dry run:"
+        assert output =~ "Tests that would be executed:"
+        assert output =~ "test/only_failing_test_failed.exs:4"
         assert output =~ "test/passing_and_failing_test_failed.exs:5"
-        assert output =~ "0 tests, 0 failures (dry run)"
+        assert output =~ "0 tests, 0 failures"
+
+        # Tests are still marked as failed
+        output = mix(["test", "--dry-run", "failed"])
+        assert output =~ "0 tests, 0 failures"
       end)
     end
   end