file locations consistency

[akkoma] / test / pagination_test.exs

diff --git a/test/pagination_test.exs b/test/pagination_test.exs
index 048ab6f3c0942e15bac8ca9dc0fbd61703c0dee5..e526f23e89731c27fa0c63476aaced445748ab38 100644 (file)
--- a/test/pagination_test.exs
+++ b/test/pagination_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.PaginationTest do
@@ -19,7 +19,9 @@ defmodule Pleroma.PaginationTest do
 
     test "paginates by min_id", %{notes: notes} do
       id = Enum.at(notes, 2).id |> Integer.to_string()
-      %{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"min_id" => id})
+
+      %{total: total, items: paginated} =
+        Pagination.fetch_paginated(Object, %{min_id: id, total: true})
 
       assert length(paginated) == 2
       assert total == 5
@@ -27,7 +29,9 @@ defmodule Pleroma.PaginationTest do
 
     test "paginates by since_id", %{notes: notes} do
       id = Enum.at(notes, 2).id |> Integer.to_string()
-      %{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"since_id" => id})
+
+      %{total: total, items: paginated} =
+        Pagination.fetch_paginated(Object, %{since_id: id, total: true})
 
       assert length(paginated) == 2
       assert total == 5
@@ -35,7 +39,9 @@ defmodule Pleroma.PaginationTest do
 
     test "paginates by max_id", %{notes: notes} do
       id = Enum.at(notes, 1).id |> Integer.to_string()
-      %{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"max_id" => id})
+
+      %{total: total, items: paginated} =
+        Pagination.fetch_paginated(Object, %{max_id: id, total: true})
 
       assert length(paginated) == 1
       assert total == 5
@@ -44,11 +50,23 @@ defmodule Pleroma.PaginationTest do
     test "paginates by min_id & limit", %{notes: notes} do
       id = Enum.at(notes, 2).id |> Integer.to_string()
 
-      %{total: total, items: paginated} =
-        Pagination.fetch_paginated(Object, %{"min_id" => id, "limit" => 1})
+      paginated = Pagination.fetch_paginated(Object, %{min_id: id, limit: 1})
+
+      assert length(paginated) == 1
+    end
+
+    test "handles id gracefully", %{notes: notes} do
+      id = Enum.at(notes, 1).id |> Integer.to_string()
+
+      paginated =
+        Pagination.fetch_paginated(Object, %{
+          id: "9s99Hq44Cnv8PKBwWG",
+          max_id: id,
+          limit: 20,
+          offset: 0
+        })
 
       assert length(paginated) == 1
-      assert total == 5
     end
   end
 
@@ -60,19 +78,15 @@ defmodule Pleroma.PaginationTest do
     end
 
     test "paginates by limit" do
-      %{total: total, items: paginated} =
-        Pagination.fetch_paginated(Object, %{"limit" => 2}, :offset)
+      paginated = Pagination.fetch_paginated(Object, %{limit: 2}, :offset)
 
       assert length(paginated) == 2
-      assert total == 5
     end
 
     test "paginates by limit & offset" do
-      %{total: total, items: paginated} =
-        Pagination.fetch_paginated(Object, %{"limit" => 2, "offset" => 4}, :offset)
+      paginated = Pagination.fetch_paginated(Object, %{limit: 2, offset: 4}, :offset)
 
       assert length(paginated) == 1
-      assert total == 5
     end
   end
 end