Skip to content

Commit 0bd45a0

Browse files
committed
Display include and exclude filters separately
1 parent 68f570c commit 0bd45a0

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

lib/ex_unit/lib/ex_unit/cli_formatter.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ defmodule ExUnit.CLIFormatter do
55

66
use GenServer.Behaviour
77

8-
import ExUnit.Formatter, only: [format_time: 2, format_filters: 1, format_test_failure: 5, format_test_case_failure: 4]
8+
import ExUnit.Formatter, only: [format_time: 2, format_filters: 2, format_test_failure: 5, format_test_case_failure: 4]
99

1010
defrecord Config, tests_counter: 0, invalids_counter: 0, failures_counter: 0,
1111
skips_counter: 0, trace: false, color: true, previous: nil
@@ -155,9 +155,9 @@ defmodule ExUnit.CLIFormatter do
155155
end
156156
end
157157

158-
defp print_filters(filters) do
159-
filters = Enum.reject filters, &Enum.empty?(elem(&1, 1))
160-
unless Enum.empty?(filters), do: IO.puts format_filters(filters)
158+
defp print_filters([include: include, exclude: exclude]) do
159+
unless Enum.empty?(include), do: IO.puts format_filters(include, :include)
160+
unless Enum.empty?(exclude), do: IO.puts format_filters(exclude, :exclude)
161161
end
162162

163163
defp print_test_failure(ExUnit.Test[name: name, case: mod, state: { :failed, tuple }], config) do

lib/ex_unit/lib/ex_unit/formatter.ex

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,16 @@ defmodule ExUnit.Formatter do
7272
7373
## Examples
7474
75-
iex> format_filters([run: true, slow: false])
76-
"Using filters: [run: true, slow: false]"
75+
iex> format_filters([run: true, slow: false], :include)
76+
"Including tags: [run: true, slow: false]"
7777
7878
"""
79-
@spec format_filters(Keyword.t) :: String.t
80-
def format_filters(filters) do
81-
"Using filters: #{inspect filters}"
79+
@spec format_filters(Keyword.t, atom) :: String.t
80+
def format_filters(filters, type) do
81+
case type do
82+
:include -> "Including tags: #{inspect filters}"
83+
:exclude -> "Excluding tags: #{inspect filters}"
84+
end
8285
end
8386

8487
@doc %S"""

lib/ex_unit/test/ex_unit/formatter_test.exs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ defmodule ExUnit.FormatterTest do
2020

2121
test "formats test case filters" do
2222
filters = [run: true, slow: false]
23-
assert format_filters(filters) =~ "Using filters: [run: true, slow: false]"
23+
assert format_filters(filters, :include) =~ "Including tags: [run: true, slow: false]"
24+
assert format_filters(filters, :exclude) =~ "Excluding tags: [run: true, slow: false]"
2425
end
2526

2627
test "formats test errors" do

0 commit comments

Comments
 (0)