Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for...

[akkoma] / test / web / feed / user_controller_test.exs

diff --git a/test/web/feed/user_controller_test.exs b/test/web/feed/user_controller_test.exs
index e3dfa88f19740a134f0ec2789699886841e1b179..05ad427c2487c2663e8b6efcd497aa083e5f608a 100644 (file)
--- a/test/web/feed/user_controller_test.exs
+++ b/test/web/feed/user_controller_test.exs
@@ -12,14 +12,12 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
   alias Pleroma.Object
   alias Pleroma.User
 
-  clear_config([:instance, :federating]) do
-    Config.put([:instance, :federating], true)
-  end
+  setup do: clear_config([:instance, :federating], true)
 
   describe "feed" do
-    clear_config([:feed])
+    setup do: clear_config([:feed])
 
-    test "gets an atom feed", %{conn: conn} do
+    test "gets a feed", %{conn: conn} do
       Config.put(
         [:feed, :post_title],
         %{max_length: 10, omission: "..."}
@@ -139,7 +137,7 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
 
       resp =
         conn
-        |> put_req_header("accept", "application/atom+xml")
+        |> put_req_header("accept", "application/rss+xml")
         |> get("/users/#{user.nickname}/feed.rss", %{"max_id" => note_activity2.id})
         |> response(200)