From: lain Date: Sun, 25 Feb 2018 15:40:37 +0000 (+0100) Subject: Fix specs. X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8e7f63afde9ea0fcc3d7955b850ce8564f4eb6e9;p=akkoma Fix specs. --- diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 2ae01c2cc..b16c1e342 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -450,4 +450,5 @@ defmodule Pleroma.User do end def ap_enabled?(%User{info: info}), do: info["ap_enabled"] + def ap_enabled?(_), do: false end diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index 957687c43..c8082cd03 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -3,6 +3,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do import Pleroma.Factory alias Pleroma.Web.ActivityPub.{UserView, ObjectView} alias Pleroma.{Repo, User} + alias Pleroma.Activity describe "/users/:nickname" do test "it returns a json representation of the user", %{conn: conn} do @@ -38,9 +39,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do conn = conn |> assign(:valid_signature, true) |> put_req_header("content-type", "application/activity+json") - |> post("/users/doesntmatter/inbox", data) + |> post("/inbox", data) assert "ok" == json_response(conn, 200) + :timer.sleep(500) + assert Activity.get_by_ap_id(data["id"]) end end end