From b1d1f9bc271d80f05b2f636e304775e6803c02f6 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 25 Oct 2018 05:24:17 +0000
Subject: [PATCH] tests: add test for user inbox

---
 test/fixtures/mastodon-post-activity.json     |  1 -
 .../activity_pub_controller_test.exs          | 23 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/test/fixtures/mastodon-post-activity.json b/test/fixtures/mastodon-post-activity.json
index 693e0ce39..b91263431 100644
--- a/test/fixtures/mastodon-post-activity.json
+++ b/test/fixtures/mastodon-post-activity.json
@@ -21,7 +21,6 @@
         "http://localtesting.pleroma.lol/users/lain"
     ],
     "id": "http://mastodon.example.org/users/admin/statuses/99512778738411822/activity",
-    "nickname": "lain",
     "object": {
         "atomUri": "http://mastodon.example.org/users/admin/statuses/99512778738411822",
         "attachment": [],
diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs
index 3ed7be402..e63cd6583 100644
--- a/test/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/web/activity_pub/activity_pub_controller_test.exs
@@ -46,7 +46,7 @@ test "it returns 404 for non-public messages", %{conn: conn} do
     end
   end
 
-  describe "/users/:nickname/inbox" do
+  describe "/inbox" do
     test "it inserts an incoming activity into the database", %{conn: conn} do
       data = File.read!("test/fixtures/mastodon-post-activity.json") |> Poison.decode!()
 
@@ -62,6 +62,27 @@ test "it inserts an incoming activity into the database", %{conn: conn} do
     end
   end
 
+  describe "/users/:nickname/inbox" do
+    test "it inserts an incoming activity into the database", %{conn: conn} do
+      user = insert(:user)
+
+      data =
+        File.read!("test/fixtures/mastodon-post-activity.json")
+        |> Poison.decode!()
+        |> Map.put("bcc", [user.ap_id])
+
+      conn =
+        conn
+        |> assign(:valid_signature, true)
+        |> put_req_header("content-type", "application/activity+json")
+        |> post("/users/#{user.nickname}/inbox", data)
+
+      assert "ok" == json_response(conn, 200)
+      :timer.sleep(500)
+      assert Activity.get_by_ap_id(data["id"])
+    end
+  end
+
   describe "/users/:nickname/outbox" do
     test "it returns a note activity in a collection", %{conn: conn} do
       note_activity = insert(:note_activity)