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 'remotes/origin/develop' into feature/object-hashtags...
[akkoma]
/
test
/
pleroma
/
web
/
feed
/
tag_controller_test.exs
diff --git
a/test/pleroma/web/feed/tag_controller_test.exs
b/test/pleroma/web/feed/tag_controller_test.exs
index 48dc3b404e9ba0fcac191fe0264d457338cbc89c..5c9201de1e3de82c15cce7666fa258215f8e471f 100644
(file)
--- a/
test/pleroma/web/feed/tag_controller_test.exs
+++ b/
test/pleroma/web/feed/tag_controller_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Feed.TagControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Feed.TagControllerTest do
@@
-8,7
+8,6
@@
defmodule Pleroma.Web.Feed.TagControllerTest do
import Pleroma.Factory
import SweetXml
import Pleroma.Factory
import SweetXml
- alias Pleroma.Config
alias Pleroma.Object
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.Feed.FeedView
alias Pleroma.Object
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.Feed.FeedView
@@
-16,7
+15,7
@@
defmodule Pleroma.Web.Feed.TagControllerTest do
setup do: clear_config([:feed])
test "gets a feed (ATOM)", %{conn: conn} do
setup do: clear_config([:feed])
test "gets a feed (ATOM)", %{conn: conn} do
-
Config.put
(
+
clear_config
(
[:feed, :post_title],
%{max_length: 25, omission: "..."}
)
[:feed, :post_title],
%{max_length: 25, omission: "..."}
)
@@
-83,7
+82,7
@@
defmodule Pleroma.Web.Feed.TagControllerTest do
end
test "gets a feed (RSS)", %{conn: conn} do
end
test "gets a feed (RSS)", %{conn: conn} do
-
Config.put
(
+
clear_config
(
[:feed, :post_title],
%{max_length: 25, omission: "..."}
)
[:feed, :post_title],
%{max_length: 25, omission: "..."}
)