summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-07-12 05:54:14 +0000
committerlambda <pleromagit@rogerbraun.net>2018-07-12 05:54:14 +0000
commitb06e61bc4ea0a0b4c8e8ff9e4469b6def7e13932 (patch)
tree16d08abe6e4a762cbd61177465be48361296d081 /test
parentd386e8a8253aecbd7a8f951f4624cc4943280125 (diff)
parent85465512578d8113366e71d9122d336b8fd49fa4 (diff)
downloadpleroma-b06e61bc4ea0a0b4c8e8ff9e4469b6def7e13932.tar.gz
pleroma-b06e61bc4ea0a0b4c8e8ff9e4469b6def7e13932.zip
Merge branch 'bugfix/x509-public-key' into 'develop'
activitypub: switch to using x509 representation for public keys instead of pkcs#1 See merge request pleroma/pleroma!248
Diffstat (limited to 'test')
-rw-r--r--test/web/activity_pub/views/user_view_test.exs2
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