X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fcommon_api%2Fcommon_api_utils_test.exs;h=754bc72557e8a9e630797ebf78f1c5d9fe175dc7;hb=be0fb5dec47e5dc69aaef5f9c4f6910eba92b48a;hp=cf97b2bfd2a33ae7a713365c791b539bc30d876f;hpb=f9d13558c8198bf2a25035dfb3c112aaa2be4cbf;p=akkoma

diff --git a/test/web/common_api/common_api_utils_test.exs b/test/web/common_api/common_api_utils_test.exs
index cf97b2bfd..754bc7255 100644
--- a/test/web/common_api/common_api_utils_test.exs
+++ b/test/web/common_api/common_api_utils_test.exs
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.CommonAPI.UtilsTest do
   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.Endpoint
@@ -37,16 +41,69 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
     expected = [
       %{
         "type" => "Emoji",
-        "icon" => %{"url" => "#{Endpoint.url()}/finmoji/128px/perkele-128.png"},
+        "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}/finmoji/128px/perkele-128.png"},
         "name" => ":perkele:"
       },
       %{
         "type" => "Emoji",
-        "icon" => %{"url" => "#{Endpoint.url()}/finmoji/128px/karjalanpiirakka-128.png"},
+        "icon" => %{
+          "type" => "Image",
+          "url" => "#{Endpoint.url()}/finmoji/128px/karjalanpiirakka-128.png"
+        },
         "name" => ":karjalanpiirakka:"
       }
     ]
 
     assert expected == Utils.emoji_from_profile(user)
   end
+
+  describe "format_input/4" do
+    test "works for bare text/plain" do
+      text = "hello world!"
+      expected = "hello world!"
+
+      output = Utils.format_input(text, [], [], "text/plain")
+
+      assert output == expected
+
+      text = "hello world!\n\nsecond paragraph!"
+      expected = "hello world!<br><br>second paragraph!"
+
+      output = Utils.format_input(text, [], [], "text/plain")
+
+      assert output == expected
+    end
+
+    test "works for bare text/html" do
+      text = "<p>hello world!</p>"
+      expected = "<p>hello world!</p>"
+
+      output = Utils.format_input(text, [], [], "text/html")
+
+      assert output == expected
+
+      text = "<p>hello world!</p>\n\n<p>second paragraph</p>"
+      expected = "<p>hello world!</p>\n\n<p>second paragraph</p>"
+
+      output = Utils.format_input(text, [], [], "text/html")
+
+      assert output == expected
+    end
+
+    test "works for bare text/markdown" do
+      text = "**hello world**"
+      expected = "<p><strong>hello world</strong></p>\n"
+
+      output = Utils.format_input(text, [], [], "text/markdown")
+
+      assert output == expected
+
+      text = "**hello world**\n\n*another paragraph*"
+      expected = "<p><strong>hello world</strong></p>\n<p><em>another paragraph</em></p>\n"
+
+      output = Utils.format_input(text, [], [], "text/markdown")
+
+      assert output == expected
+    end
+  end
 end