diff options
| author | Tristan Mahé <gled@remote-shell.net> | 2018-07-13 11:14:37 -0700 |
|---|---|---|
| committer | Tristan Mahé <gled@remote-shell.net> | 2018-07-13 11:14:37 -0700 |
| commit | 5469fb9561bb886deb8434e545dfb711eb20f341 (patch) | |
| tree | 78ab675afd6169e2497b5c47882725cc1d2f2326 /test/web/activity_pub | |
| parent | c06a5af386a3cdfeda0b2c21963d9200fb7d6c89 (diff) | |
| parent | d93789dfde3c44c76a56732088a897ddddfe9716 (diff) | |
| download | pleroma-5469fb9561bb886deb8434e545dfb711eb20f341.tar.gz pleroma-5469fb9561bb886deb8434e545dfb711eb20f341.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
Diffstat (limited to 'test/web/activity_pub')
| -rw-r--r-- | test/web/activity_pub/views/user_view_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/activity_pub/views/user_view_test.exs b/test/web/activity_pub/views/user_view_test.exs index 0c64e62c3..7fc870e96 100644 --- a/test/web/activity_pub/views/user_view_test.exs +++ b/test/web/activity_pub/views/user_view_test.exs @@ -13,6 +13,6 @@ defmodule Pleroma.Web.ActivityPub.UserViewTest do assert result["id"] == user.ap_id assert result["preferredUsername"] == user.nickname - assert String.contains?(result["publicKey"]["publicKeyPem"], "BEGIN RSA PUBLIC KEY") + assert String.contains?(result["publicKey"]["publicKeyPem"], "BEGIN PUBLIC KEY") end end |