Fix specs.
authorlain <lain@soykaf.club>
Fri, 17 May 2019 09:49:13 +0000 (11:49 +0200)
committerlain <lain@soykaf.club>
Fri, 17 May 2019 09:49:13 +0000 (11:49 +0200)
lib/pleroma/user.ex
test/web/ostatus/ostatus_test.exs

index 9607c1f037d09c1d70a9dc643b67e5b9b6460964..28da310ee1d443acad326e568e5af3f3b013dfcf 100644 (file)
@@ -1144,7 +1144,6 @@ defmodule Pleroma.User do
     stream =
       ap_id
       |> Activity.query_by_actor()
-      |> Activity.with_preloaded_object()
       |> Repo.stream()
 
     Repo.transaction(fn -> Enum.each(stream, &delete_activity(&1)) end, timeout: :infinity)
index 3516a13fafdc18dc6f357f449698a58cb3505505..f6be16862e34bb6864b2780390b1fa0625176189 100644 (file)
@@ -407,7 +407,7 @@ defmodule Pleroma.Web.OStatusTest do
       {:ok, user} = OStatus.find_or_make_user(uri)
       old_name = user.name
       old_bio = user.bio
-      change = Ecto.Changeset.change(user, %{avatar: nil, bio: nil, old_name: nil})
+      change = Ecto.Changeset.change(user, %{avatar: nil, bio: nil, name: nil})
 
       {:ok, user} = Repo.update(change)
       refute user.avatar