diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-26 03:00:38 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-26 03:00:38 +0000 |
| commit | 48a82c46096a560fe9331a63f19ace6faaf98c3d (patch) | |
| tree | 02c6216dbcb3814115aa64de0ef5a171121b527e /test/web/ostatus | |
| parent | 59ae9255fbf7abd6efe46799b19c094724f5d51b (diff) | |
| parent | 035f22f7849815c5f77a734c56f409c0f08ac853 (diff) | |
| download | pleroma-48a82c46096a560fe9331a63f19ace6faaf98c3d.tar.gz pleroma-48a82c46096a560fe9331a63f19ace6faaf98c3d.zip | |
Merge branch 'refactor/user' into 'develop'
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
Diffstat (limited to 'test/web/ostatus')
| -rw-r--r-- | test/web/ostatus/ostatus_controller_test.exs | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs index ec96f0012..2b40fb47e 100644 --- a/test/web/ostatus/ostatus_controller_test.exs +++ b/test/web/ostatus/ostatus_controller_test.exs @@ -50,20 +50,16 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do assert response(conn, 200) end) =~ "[error]" - # Set a wrong magic-key for a user so it has to refetch - salmon_user = User.get_cached_by_ap_id("http://gs.example.org:4040/index.php/user/1") - # Wrong key - info_cng = - User.Info.remote_user_creation(salmon_user.info, %{ - magic_key: - "RSA.pu0s-halox4tu7wmES1FVSx6u-4wc0YrUFXcqWXZG4-27UmbCOpMQftRCldNRfyA-qLbz-eqiwrong1EwUvjsD4cYbAHNGHwTvDOyx5AKthQUP44ykPv7kjKGh3DWKySJvcs9tlUG87hlo7AvnMo9pwRS_Zz2CacQ-MKaXyDepk=.AQAB" - }) - - salmon_user - |> Ecto.Changeset.change() - |> Ecto.Changeset.put_embed(:info, info_cng) - |> User.update_and_set_cache() + info = %{ + magic_key: + "RSA.pu0s-halox4tu7wmES1FVSx6u-4wc0YrUFXcqWXZG4-27UmbCOpMQftRCldNRfyA-qLbz-eqiwrong1EwUvjsD4cYbAHNGHwTvDOyx5AKthQUP44ykPv7kjKGh3DWKySJvcs9tlUG87hlo7AvnMo9pwRS_Zz2CacQ-MKaXyDepk=.AQAB" + } + + # Set a wrong magic-key for a user so it has to refetch + "http://gs.example.org:4040/index.php/user/1" + |> User.get_cached_by_ap_id() + |> User.update_info(&User.Info.remote_user_creation(&1, info)) assert capture_log(fn -> conn = |