Merge pull request #81 from VitorTrin/redefine-expects

Allow redefining the expectations for a route

Author: ream88

lib/bypass/instance.ex

@@ -134,24 +134,18 @@ defmodule Bypass.Instance do
     route = {method, path}
 
     updated_expectations =
-      case Map.get(expectations, route, :none) do
-        :none ->
-          Map.put(
-            expectations,
-            route,
-            new_route(
-              fun,
-              case expect do
-                :expect -> :once_or_more
-                :expect_once -> :once
-                :stub -> :none_or_more
-              end
-            )
-          )
-
-        _ ->
-          raise "Route already installed for #{method}, #{path}"
-      end
+      Map.put(
+        expectations,
+        route,
+        new_route(
+          fun,
+          case expect do
+            :expect -> :once_or_more
+            :expect_once -> :once
+            :stub -> :none_or_more
+          end
+        )
+      )
 
     {:reply, :ok, %{state | expectations: updated_expectations}}
   end

test/bypass_test.exs

@@ -16,8 +16,9 @@ defmodule BypassTest do
   end
 
   test "show ISSUE #51" do
-    Enum.each(1..1000,
-      fn (_) ->
+    Enum.each(
+      1..1000,
+      fn _ ->
         bypass = %Bypass{} = Bypass.open(port: 8000)
 
         Bypass.down(bypass)
@@ -447,6 +448,52 @@ defmodule BypassTest do
     end
   end
 
+  test "Bypass.expect/4 can be used to define a specific route and then redefined" do
+    :expect |> specific_route_redefined
+  end
+
+  test "Bypass.expect_once/4 can be used to define a specific route and then redefined" do
+    :expect_once |> specific_route_redefined
+  end
+
+  defp specific_route_redefined(expect_fun) do
+    bypass = Bypass.open()
+    method = "POST"
+    path = "/this"
+
+    # one of Bypass.expect or Bypass.expect_once
+    apply(Bypass, expect_fun, [
+      bypass,
+      method,
+      path,
+      fn conn ->
+        assert conn.method == method
+        assert conn.request_path == path
+        Plug.Conn.send_resp(conn, 200, "")
+      end
+    ])
+
+    capture_log(fn ->
+      assert {:ok, 200, ""} = request(bypass.port, path)
+    end)
+
+    # redefining the expect
+    apply(Bypass, expect_fun, [
+      bypass,
+      method,
+      path,
+      fn conn ->
+        assert conn.method == method
+        assert conn.request_path == path
+        Plug.Conn.send_resp(conn, 200, "other response")
+      end
+    ])
+
+    capture_log(fn ->
+      assert {:ok, 200, "other response"} = request(bypass.port, path)
+    end)
+  end
+
   defp prepare_stubs do
     bypass = Bypass.open()