Merge branch 'develop' into issue/1276

[akkoma] / test / marker_test.exs

diff --git a/test/marker_test.exs b/test/marker_test.exs
index 7b1d2218ab0f57c566a70e61472450d1d41f5069..5b6d0b4a4729b4af0886fefb25f013222a7eefe7 100644 (file)
--- a/test/marker_test.exs
+++ b/test/marker_test.exs
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.MarkerTest do
@@ -15,7 +15,7 @@ defmodule Pleroma.MarkerTest do
       assert %Ecto.Multi{
                operations: [marker: {:run, _}, counters: {:run, _}]
              } =
-               Marker.multi_set_unread_count(
+               Marker.multi_set_last_read_id(
                  Ecto.Multi.new(),
                  user,
                  "notifications"
@@ -25,19 +25,12 @@ defmodule Pleroma.MarkerTest do
     test "return empty multi" do
       user = insert(:user)
       multi = Ecto.Multi.new()
-      assert Marker.multi_set_unread_count(multi, user, "home") == multi
+      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(:marker, timeline: "home", user: user)
-      assert Marker.get_markers(user, ["notifications"]) == [refresh_record(marker)]
-    end
-
-    test "returns user markers with recount unread notifications" do
       user = insert(:user)
       marker = insert(:marker, user: user)
       insert(:notification, user: user)
@@ -46,8 +39,7 @@ defmodule Pleroma.MarkerTest do
 
       assert Marker.get_markers(
                user,
-               ["notifications"],
-               %{recount_unread: true}
+               ["notifications"]
              ) == [%Marker{refresh_record(marker) | unread_count: 2}]
     end
   end