Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 78 deletions

diff --git a/test/marker_test.exs b/test/marker_test.exs
deleted file mode 100644
index 5b6d0b4a4..000000000
--- a/test/marker_test.exs
+++ /dev/null
@@ -1,78 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.MarkerTest do
-  use Pleroma.DataCase
-  alias Pleroma.Marker
-
-  import Pleroma.Factory
-
-  describe "multi_set_unread_count/3" do
-    test "returns multi" do
-      user = insert(:user)
-
-      assert %Ecto.Multi{
-               operations: [marker: {:run, _}, counters: {:run, _}]
-             } =
-               Marker.multi_set_last_read_id(
-                 Ecto.Multi.new(),
-                 user,
-                 "notifications"
-               )
-    end
-
-    test "return empty multi" do
-      user = insert(:user)
-      multi = Ecto.Multi.new()
-      assert Marker.multi_set_last_read_id(multi, user, "home") == multi
-    end
-  end
-
-  describe "get_markers/2" do
-    test "returns user markers" do
-      user = insert(:user)
-      marker = insert(:marker, user: user)
-      insert(:notification, user: user)
-      insert(:notification, user: user)
-      insert(:marker, timeline: "home", user: user)
-
-      assert Marker.get_markers(
-               user,
-               ["notifications"]
-             ) == [%Marker{refresh_record(marker) | unread_count: 2}]
-    end
-  end
-
-  describe "upsert/2" do
-    test "creates a marker" do
-      user = insert(:user)
-
-      {:ok, %{"notifications" => %Marker{} = marker}} =
-        Marker.upsert(
-          user,
-          %{"notifications" => %{"last_read_id" => "34"}}
-        )
-
-      assert marker.timeline == "notifications"
-      assert marker.last_read_id == "34"
-      assert marker.lock_version == 0
-    end
-
-    test "updates exist marker" do
-      user = insert(:user)
-      marker = insert(:marker, user: user, last_read_id: "8909")
-
-      {:ok, %{"notifications" => %Marker{}}} =
-        Marker.upsert(
-          user,
-          %{"notifications" => %{"last_read_id" => "9909"}}
-        )
-
-      marker = refresh_record(marker)
-      assert marker.timeline == "notifications"
-      assert marker.last_read_id == "9909"
-      assert marker.lock_version == 0
-    end
-  end
-end