diff options
author | feld <feld@feld.me> | 2019-04-06 16:03:35 +0000 |
---|---|---|
committer | feld <feld@feld.me> | 2019-04-06 16:03:35 +0000 |
commit | 876965a7e7bc369fcc48e8fc265db0e49569e056 (patch) | |
tree | 5e633868effe1e31043039dc84c4abc5890488dd | |
parent | 9aeac7dccac802073977c8149b2dda1f0ce07226 (diff) | |
parent | e9c075d05c2f11b905d40ed86dd19818acf310ec (diff) | |
download | pleroma-876965a7e7bc369fcc48e8fc265db0e49569e056.tar.gz pleroma-876965a7e7bc369fcc48e8fc265db0e49569e056.zip |
Merge branch 'fix/failed-legacy-test' into 'develop'
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS
See merge request pleroma/pleroma!1030
-rw-r--r-- | test/plugs/legacy_authentication_plug_test.exs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/test/plugs/legacy_authentication_plug_test.exs b/test/plugs/legacy_authentication_plug_test.exs index 302662797..8b0b06772 100644 --- a/test/plugs/legacy_authentication_plug_test.exs +++ b/test/plugs/legacy_authentication_plug_test.exs @@ -47,16 +47,18 @@ defmodule Pleroma.Plugs.LegacyAuthenticationPlugTest do |> assign(:auth_user, user) conn = - with_mock User, - reset_password: fn user, %{password: password, password_confirmation: password} -> - send(self(), :reset_password) - {:ok, user} - end do - conn - |> LegacyAuthenticationPlug.call(%{}) + with_mocks([ + {:crypt, [], [crypt: fn _password, password_hash -> password_hash end]}, + {User, [], + [ + reset_password: fn user, %{password: password, password_confirmation: password} -> + {:ok, user} + end + ]} + ]) do + LegacyAuthenticationPlug.call(conn, %{}) end - assert_received :reset_password assert conn.assigns.user == user end |