From daaa8cd66acf29eb869dd535b372f6673e9b3030 Mon Sep 17 00:00:00 2001
From: href <href@random.sh>
Date: Tue, 18 Dec 2018 13:40:25 +0100
Subject: SetUserSessionIdPlugTest: try to fix random ci failures

---
 test/plugs/set_user_session_id_plug_test.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'test')

diff --git a/test/plugs/set_user_session_id_plug_test.exs b/test/plugs/set_user_session_id_plug_test.exs
index 5edc0dab8..a5fdd4146 100644
--- a/test/plugs/set_user_session_id_plug_test.exs
+++ b/test/plugs/set_user_session_id_plug_test.exs
@@ -1,6 +1,8 @@
 defmodule Pleroma.Plugs.SetUserSessionIdPlugTest do
   use Pleroma.Web.ConnCase, async: true
 
+  Code.ensure_compiled(Pleroma.User)
+
   alias Pleroma.Plugs.SetUserSessionIdPlug
   alias Pleroma.User
 
-- 
cgit v1.2.3


From 8a67677d7791287905898bc388fbd8d9c81ec2b1 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Tue, 18 Dec 2018 22:10:56 +0300
Subject: Add test

---
 test/formatter_test.exs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'test')

diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index bb318b7d5..cfa735795 100644
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -22,6 +22,18 @@ defmodule Pleroma.FormatterTest do
       assert expected_text ==
                Formatter.add_hashtag_links({[], text}, tags) |> Formatter.finalize()
     end
+
+    test "does not turn html characters to tags" do
+      text = "Fact #3: pleroma does what mastodon't"
+
+      expected_text =
+        "Fact <a data-tag=\"3\" href=\"http://localhost:4001/tag/3\">#3</a>: pleroma does what mastodon't"
+
+      tags = Formatter.parse_tags(text)
+
+      assert expected_text ==
+               Formatter.add_hashtag_links({[], text}, tags) |> Formatter.finalize()
+    end
   end
 
   describe ".add_links" do
-- 
cgit v1.2.3


From 196d9c0fd089942deff62aeeea60bef1972cbe38 Mon Sep 17 00:00:00 2001
From: Rin Toshaka <rinpatch@sdf.org>
Date: Tue, 18 Dec 2018 20:30:04 +0100
Subject: Fix tests

---
 test/formatter_test.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index cfa735795..6cdfa4167 100644
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -27,7 +27,7 @@ defmodule Pleroma.FormatterTest do
       text = "Fact #3: pleroma does what mastodon't"
 
       expected_text =
-        "Fact <a data-tag=\"3\" href=\"http://localhost:4001/tag/3\">#3</a>: pleroma does what mastodon't"
+        "Fact <a data-tag='3' href='http://localhost:4001/tag/3' rel='tag'>#3</a>: pleroma does what mastodon't"
 
       tags = Formatter.parse_tags(text)
 
-- 
cgit v1.2.3


From f3eb414e282dd0e3bd5c60838e45c69cf21541e4 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 18 Dec 2018 21:08:52 +0100
Subject: Add a way to use the admin api without a user.

---
 .../admin_secret_authentication_plug_test.exs      | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 test/plugs/admin_secret_authentication_plug_test.exs

(limited to 'test')

diff --git a/test/plugs/admin_secret_authentication_plug_test.exs b/test/plugs/admin_secret_authentication_plug_test.exs
new file mode 100644
index 000000000..c0fe2cf97
--- /dev/null
+++ b/test/plugs/admin_secret_authentication_plug_test.exs
@@ -0,0 +1,38 @@
+defmodule Pleroma.Plugs.AdminSecretAuthenticationPlugTest do
+  use Pleroma.Web.ConnCase, async: true
+  import Pleroma.Factory
+
+  alias Pleroma.Plugs.AdminSecretAuthenticationPlug
+
+  test "does nothing if a user is assigned", %{conn: conn} do
+    user = insert(:user)
+
+    conn =
+      conn
+      |> assign(:user, user)
+
+    ret_conn =
+      conn
+      |> AdminSecretAuthenticationPlug.call(%{})
+
+    assert conn == ret_conn
+  end
+
+  test "with secret set and given in the 'admin_token' parameter, it assigns an admin user", %{
+    conn: conn
+  } do
+    Pleroma.Config.put(:admin_token, "password123")
+
+    conn =
+      %{conn | params: %{"admin_token" => "wrong_password"}}
+      |> AdminSecretAuthenticationPlug.call(%{})
+
+    refute conn.assigns[:user]
+
+    conn =
+      %{conn | params: %{"admin_token" => "password123"}}
+      |> AdminSecretAuthenticationPlug.call(%{})
+
+    assert conn.assigns[:user].info.is_admin
+  end
+end
-- 
cgit v1.2.3