X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Fostatus_controller_test.exs;h=f06023dff88e31e3fe515f0bab5e8bcecaf8ce4b;hb=64095961fe490029886cae358683532ea65bf2c0;hp=fc1635a2f8e78d8b002eadd358c592cc2396a9a0;hpb=815b9045087ff4f88355b4cfa6c0a9b8080c6db6;p=akkoma

diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs
index fc1635a2f..f06023dff 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"
-        })
+      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()
+      # 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 =
@@ -401,7 +397,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
                "oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",
                "oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token",
                "sharedInbox" => "#{Pleroma.Web.base_url()}/inbox",
-               "uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/uploadMedia"
+               "uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/upload_media"
              }
 
       assert response["@context"] == [
@@ -464,7 +460,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
                "oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",
                "oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token",
                "sharedInbox" => "#{Pleroma.Web.base_url()}/inbox",
-               "uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/uploadMedia"
+               "uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/upload_media"
              }
 
       assert response["@context"] == [