Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 29 deletions

diff --git a/test/web/mastodon_api/views/marker_view_test.exs b/test/web/mastodon_api/views/marker_view_test.exs
deleted file mode 100644
index 48a0a6d33..000000000
--- a/test/web/mastodon_api/views/marker_view_test.exs
+++ /dev/null
@@ -1,29 +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.Web.MastodonAPI.MarkerViewTest do
-  use Pleroma.DataCase
-  alias Pleroma.Web.MastodonAPI.MarkerView
-  import Pleroma.Factory
-
-  test "returns markers" do
-    marker1 = insert(:marker, timeline: "notifications", last_read_id: "17", unread_count: 5)
-    marker2 = insert(:marker, timeline: "home", last_read_id: "42")
-
-    assert MarkerView.render("markers.json", %{markers: [marker1, marker2]}) == %{
-             "home" => %{
-               last_read_id: "42",
-               updated_at: NaiveDateTime.to_iso8601(marker2.updated_at),
-               version: 0,
-               pleroma: %{unread_count: 0}
-             },
-             "notifications" => %{
-               last_read_id: "17",
-               updated_at: NaiveDateTime.to_iso8601(marker1.updated_at),
-               version: 0,
-               pleroma: %{unread_count: 5}
-             }
-           }
-  end
-end