From 2c820e10b828ca2a00f94d09127d1234bf001d6b Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Wed, 26 Sep 2018 07:48:34 +0200
Subject: transmogrifier_test: incoming notices with tag not being an array
 (kroeg)

---
 test/web/activity_pub/transmogrifier_test.exs | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'test/web')

diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs
index afa25bb60..42ce701ca 100644
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -121,6 +121,16 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
                "<p>henlo from my Psion netBook</p><p>message sent from my Psion netBook</p>"
     end
 
+    test "it works for incoming notices with tag not being an array (kroeg)" do
+      data = File.read!("test/fixtures/https___puckipedia.com_1jjx-ob5r.json") |> Poison.decode!()
+
+      {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
+
+      assert data["object"]["emoji"] == %{
+               "icon_e_smile" => "https://puckipedia.com/forum/images/smilies/icon_e_smile.png"
+             }
+    end
+
     test "it works for incoming follow requests" do
       user = insert(:user)
 
-- 
cgit v1.2.3


From eebe33e86a064f8dff43663af634f101d25f88b3 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Wed, 26 Sep 2018 11:27:00 +0200
Subject: transmogrifier: Add support for array-less hashtags, add broken
 announce, harden get_actor

---
 test/web/activity_pub/transmogrifier_test.exs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'test/web')

diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs
index 42ce701ca..7b3c05caa 100644
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -121,14 +121,30 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
                "<p>henlo from my Psion netBook</p><p>message sent from my Psion netBook</p>"
     end
 
+    # Broken ;/
+    #
+    #    test "it works for incoming announces with actor being inlined (kroeg)" do
+    #      data = File.read!("test/fixtures/kroeg-announce-with-inline-actor.json") |> Poison.decode!()
+    #
+    #      {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
+    #
+    #      assert data["object"]["actor"] == "https://puckipedia.com/"
+    #    end
+
     test "it works for incoming notices with tag not being an array (kroeg)" do
-      data = File.read!("test/fixtures/https___puckipedia.com_1jjx-ob5r.json") |> Poison.decode!()
+      data = File.read!("test/fixtures/kroeg-array-less-emoji.json") |> Poison.decode!()
 
       {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
 
       assert data["object"]["emoji"] == %{
                "icon_e_smile" => "https://puckipedia.com/forum/images/smilies/icon_e_smile.png"
              }
+
+      data = File.read!("test/fixtures/kroeg-array-less-hashtag.json") |> Poison.decode!()
+
+      {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
+
+      assert "test" in data["object"]["tag"]
     end
 
     test "it works for incoming follow requests" do
-- 
cgit v1.2.3


From d830a243a34b1c41ac81f368bce565285bd89ab7 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 27 Sep 2018 07:14:15 +0000
Subject: transmogrifier: more robustly handle dereferencing pointer URIs

---
 test/web/activity_pub/transmogrifier_test.exs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'test/web')

diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs
index 7b3c05caa..6a6f2a44c 100644
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -121,15 +121,13 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
                "<p>henlo from my Psion netBook</p><p>message sent from my Psion netBook</p>"
     end
 
-    # Broken ;/
-    #
-    #    test "it works for incoming announces with actor being inlined (kroeg)" do
-    #      data = File.read!("test/fixtures/kroeg-announce-with-inline-actor.json") |> Poison.decode!()
-    #
-    #      {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
-    #
-    #      assert data["object"]["actor"] == "https://puckipedia.com/"
-    #    end
+    test "it works for incoming announces with actor being inlined (kroeg)" do
+      data = File.read!("test/fixtures/kroeg-announce-with-inline-actor.json") |> Poison.decode!()
+
+      {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
+
+      assert data["actor"] == "https://puckipedia.com/"
+    end
 
     test "it works for incoming notices with tag not being an array (kroeg)" do
       data = File.read!("test/fixtures/kroeg-array-less-emoji.json") |> Poison.decode!()
-- 
cgit v1.2.3