diff options
author | lain <lain@soykaf.club> | 2023-12-11 07:32:42 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2023-12-11 07:32:42 +0000 |
commit | e7974afd3773c3610889845b6f2c5a78762f921e (patch) | |
tree | e18ea61e399736329b8fa3465a924079086418bf /test | |
parent | a7f82ff82e400cca040c177f6f0186f840a8aa71 (diff) | |
parent | c0a50b7c3e340cd621827922200daa0f29dc6e15 (diff) | |
download | pleroma-e7974afd3773c3610889845b6f2c5a78762f921e.tar.gz pleroma-e7974afd3773c3610889845b6f2c5a78762f921e.zip |
Merge branch 'optimistic-inbox' into 'develop'
Optimistic Inbox
See merge request pleroma/pleroma!3989
Diffstat (limited to 'test')
-rw-r--r-- | test/pleroma/signature_test.exs | 5 | ||||
-rw-r--r-- | test/pleroma/user_test.exs | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/test/pleroma/signature_test.exs b/test/pleroma/signature_test.exs index b849cbee7..f5a915fa8 100644 --- a/test/pleroma/signature_test.exs +++ b/test/pleroma/signature_test.exs @@ -43,10 +43,7 @@ defmodule Pleroma.SignatureTest do end test "it returns error when not found user" do - assert capture_log(fn -> - assert Signature.fetch_public_key(make_fake_conn("https://test-ap-id")) == - {:error, :error} - end) =~ "[error] Could not decode user" + assert Signature.fetch_public_key(make_fake_conn("https://test-ap-id")) == {:error, :error} end test "it returns error if public key is nil" do diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs index b9df527a0..77ca9198b 100644 --- a/test/pleroma/user_test.exs +++ b/test/pleroma/user_test.exs @@ -1951,8 +1951,8 @@ defmodule Pleroma.UserTest do end end - test "get_public_key_for_ap_id fetches a user that's not in the db" do - assert {:ok, _key} = User.get_public_key_for_ap_id("http://mastodon.example.org/users/admin") + test "get_public_key_for_ap_id returns correctly for user that's not in the db" do + assert :error = User.get_public_key_for_ap_id("http://mastodon.example.org/users/admin") end describe "per-user rich-text filtering" do |