projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxy
[akkoma]
/
test
/
pleroma
/
web
/
feed
/
user_controller_test.exs
diff --git
a/test/pleroma/web/feed/user_controller_test.exs
b/test/pleroma/web/feed/user_controller_test.exs
index 66667783deb09b4e7a5f6a8e82ded2ecd26c8c4b..6f6ff433f193332cd4c177c6f7f2fb9b41dce06a 100644
(file)
--- a/
test/pleroma/web/feed/user_controller_test.exs
+++ b/
test/pleroma/web/feed/user_controller_test.exs
@@
-8,7
+8,6
@@
defmodule Pleroma.Web.Feed.UserControllerTest do
import Pleroma.Factory
import SweetXml
import Pleroma.Factory
import SweetXml
- alias Pleroma.Config
alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Web.CommonAPI
alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Web.CommonAPI
@@
-20,7
+19,7
@@
defmodule Pleroma.Web.Feed.UserControllerTest do
setup do: clear_config([:feed])
setup do
setup do: clear_config([:feed])
setup do
-
Config.put
(
+
clear_config
(
[:feed, :post_title],
%{max_length: 15, omission: "..."}
)
[:feed, :post_title],
%{max_length: 15, omission: "..."}
)
@@
-218,7
+217,9
@@
defmodule Pleroma.Web.Feed.UserControllerTest do
|> get("/users/#{user.nickname}")
assert conn.status == 302
|> get("/users/#{user.nickname}")
assert conn.status == 302
- assert redirected_to(conn) == "#{Pleroma.Web.base_url()}/users/#{user.nickname}/feed.atom"
+
+ assert redirected_to(conn) ==
+ "#{Pleroma.Web.Endpoint.url()}/users/#{user.nickname}/feed.atom"
end
test "with non-html / non-json format, it returns error when user is not found", %{conn: conn} do
end
test "with non-html / non-json format, it returns error when user is not found", %{conn: conn} do
@@
-236,7
+237,7
@@
defmodule Pleroma.Web.Feed.UserControllerTest do
setup do: clear_config([:instance, :public])
test "returns 404 for user feed", %{conn: conn} do
setup do: clear_config([:instance, :public])
test "returns 404 for user feed", %{conn: conn} do
-
Config.put
([:instance, :public], false)
+
clear_config
([:instance, :public], false)
user = insert(:user)
{:ok, _} = CommonAPI.post(user, %{status: "test"})
user = insert(:user)
{:ok, _} = CommonAPI.post(user, %{status: "test"})