Merge pull request #2167 from fishcakez/assert_warnings

Fix ExUnit.Assertions receive macros compiler warnings

Author: José Valim

lib/ex_unit/lib/ex_unit/assertions.ex

@@ -305,14 +305,16 @@ defmodule ExUnit.Assertions do
 
   defp do_assert_receive(expected, timeout, message) do
     binary = Macro.to_string(expected)
+    message = message ||
+      "Expected to have received message matching #{binary}"
 
     { :receive, meta, args } =
       quote do
         receive do
           unquote(expected) = received -> received
         after
           unquote(timeout) ->
-            flunk unquote(message) || "Expected to have received message matching #{unquote binary}"
+            flunk unquote(message)
         end
       end
 
@@ -488,18 +490,31 @@ defmodule ExUnit.Assertions do
   end
 
   defp do_refute_receive(not_expected, timeout, message) do
-    binary = Macro.to_string(not_expected)
+    receive_clause = refute_receive_recv(not_expected, message)
 
     quote do
       receive do
-        unquote(not_expected) = actual ->
-          flunk unquote(message) || "Expected to not have received message matching #{unquote binary}, got #{inspect actual}"
+        unquote(receive_clause)
       after
         unquote(timeout) -> false
       end
     end
   end
 
+ defp refute_receive_recv(not_expected, nil) do
+  binary = Macro.to_string(not_expected)
+  quote do
+    unquote(not_expected) = actual ->
+      flunk "Expected to not have received message matching #{unquote binary}, got #{inspect actual}"
+    end
+  end
+
+  defp refute_receive_recv(not_expected, message) do
+    quote do
+      unquote(not_expected) -> flunk unquote(message)
+    end
+  end
+
   @doc """
   Asserts the `expected` and `received` are not within `delta`.