Merge branch 'fix/config-test-warning' into 'develop'

Fix test warnings

See merge request pleroma/pleroma!3452

test/pleroma/web/admin_api/controllers/config_controller_test.exs

@@ -1427,30 +1427,27 @@ test "custom instance thumbnail", %{conn: conn} do
         ]
       }
 
-      res =
+      assert conn
-        assert conn
+             |> put_req_header("content-type", "application/json")
-               |> put_req_header("content-type", "application/json")
+             |> post("/api/pleroma/admin/config", %{"configs" => [params]})
-               |> post("/api/pleroma/admin/config", %{"configs" => [params]})
+             |> json_response_and_validate_schema(200) ==
-               |> json_response_and_validate_schema(200)
+               %{
+                 "configs" => [
+                   %{
+                     "db" => [":instance_thumbnail"],
+                     "group" => ":pleroma",
+                     "key" => ":instance",
+                     "value" => params["value"]
+                   }
+                 ],
+                 "need_reboot" => false
+               }
 
-      assert res == %{
+      assert conn
-               "configs" => [
+             |> get("/api/v1/instance")
-                 %{
+             |> json_response_and_validate_schema(200)
-                   "db" => [":instance_thumbnail"],
+             |> Map.take(["thumbnail"]) ==
-                   "group" => ":pleroma",
+               %{"thumbnail" => "https://example.com/media/new_thumbnail.jpg"}
-                   "key" => ":instance",
-                   "value" => params["value"]
-                 }
-               ],
-               "need_reboot" => false
-             }
-
-      _res =
-        assert conn
-               |> get("/api/v1/instance")
-               |> json_response_and_validate_schema(200)
-
-      assert res = %{"thumbnail" => "https://example.com/media/new_thumbnail.jpg"}
     end
 
     test "Concurrent Limiter", %{conn: conn} do

test/pleroma/web/shout_channel_test.exs

@@ -14,7 +14,7 @@ defmodule Pleroma.Web.ShoutChannelTest do
 
     {:ok, _, socket} =
       socket(UserSocket, "", %{user_name: user.nickname})
-      |> subscribe_and_join(ShoutChannel, "shout:public")
+      |> subscribe_and_join(ShoutChannel, "chat:public")
 
     {:ok, socket: socket}
   end