X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fmarker_test.exs;h=7b3943c7be5ca907b3c990daa46c72abc7d2a104;hb=9c672ecbb5d4477cd16d2139a2cb66d3923ac5c8;hp=7b1d2218ab0f57c566a70e61472450d1d41f5069;hpb=b9041c209787dc279d4dc5194d65dff73684cdb9;p=akkoma

diff --git a/test/marker_test.exs b/test/marker_test.exs
index 7b1d2218a..7b3943c7b 100644
--- 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,7 +25,7 @@ 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
 
@@ -33,21 +33,13 @@ defmodule Pleroma.MarkerTest 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)
-      insert(:notification, user: user)
+      insert(:notification, user: user, activity: insert(:note_activity))
+      insert(:notification, user: user, activity: insert(:note_activity))
       insert(:marker, timeline: "home", user: user)
 
       assert Marker.get_markers(
                user,
-               ["notifications"],
-               %{recount_unread: true}
+               ["notifications"]
              ) == [%Marker{refresh_record(marker) | unread_count: 2}]
     end
   end