mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-11-19 16:10:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix ostatus test.

Browse source
This commit is contained in:
lain 2018-11-27 18:37:46 +01:00
parent 3c61df6b9e
commit e002858071
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/user/info.ex
View file

@ -19,7 +19,8 @@ defmodule Pleroma.User.Info do
field(:keys, :string, default: nil) field(:keys, :string, default: nil)
field(:settings, :map, default: nil) field(:settings, :map, default: nil)
field(:magic_key, :string, default: nil) field(:magic_key, :string, default: nil)
# topic, subject, salmon, subscribe_address field(:uri, :string, default: nil)
# topic, subject, salmon, subscribe_address, uri
end end
def set_activation_status(info, deactivated) do def set_activation_status(info, deactivated) do
@ -97,7 +98,8 @@ defmodule Pleroma.User.Info do
:source_data, :source_data,
:banner, :banner,
:locked, :locked,
:magic_key :magic_key,
:uri
]) ])
end end

4
test/web/ostatus/ostatus_test.exs
View file

@ -17,7 +17,7 @@ defmodule Pleroma.Web.OStatusTest do
{:ok, [activity]} = OStatus.handle_incoming(incoming) {:ok, [activity]} = OStatus.handle_incoming(incoming)
user = User.get_by_ap_id(activity.data["actor"]) user = User.get_by_ap_id(activity.data["actor"])
assert user.info["note_count"] == 1 assert user.info.note_count == 1
assert activity.data["type"] == "Create" assert activity.data["type"] == "Create"
assert activity.data["object"]["type"] == "Note" assert activity.data["object"]["type"] == "Note"
@ -319,7 +319,7 @@ defmodule Pleroma.Web.OStatusTest do
assert user.name == "Constance Variable" assert user.name == "Constance Variable"
assert user.nickname == "lambadalambda@social.heldscal.la" assert user.nickname == "lambadalambda@social.heldscal.la"
assert user.local == false assert user.local == false
assert user.info["uri"] == uri assert user.info.uri == uri
assert user.ap_id == uri assert user.ap_id == uri
assert user.bio == "Call me Deacon Blues." assert user.bio == "Call me Deacon Blues."
assert user.avatar["type"] == "Image" assert user.avatar["type"] == "Image"