projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into gun
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
scheduled_activity_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs
b/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs
index 6317d1b477351aa6284531d9c30ba9f64983698c..f86274d57973e18943302eb12a52c9f9865274a8 100644
(file)
--- a/
test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityControllerTest do
@@
-11,7
+11,7
@@
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityControllerTest do
import Pleroma.Factory
import Ecto.Query
import Pleroma.Factory
import Ecto.Query
- clear_config([ScheduledActivity, :enabled])
+
setup do:
clear_config([ScheduledActivity, :enabled])
test "shows scheduled activities" do
%{user: user, conn: conn} = oauth_access(["read:statuses"])
test "shows scheduled activities" do
%{user: user, conn: conn} = oauth_access(["read:statuses"])