diff options
author | lain <lain@soykaf.club> | 2020-04-06 17:50:31 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-04-06 17:50:31 +0200 |
commit | 19335be24c25739e2334180af6c59dd8919d5fc8 (patch) | |
tree | db34531b2dd5befb495d4379aa8aaad9284fa72c /test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs | |
parent | fd97b0e634d30dec3217efcf3d67610d1b54bf8b (diff) | |
parent | 1d4ab06505ec5143dbb1d78d718fa9efd1497751 (diff) | |
download | pleroma-19335be24c25739e2334180af6c59dd8919d5fc8.tar.gz pleroma-19335be24c25739e2334180af6c59dd8919d5fc8.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs')
-rw-r--r-- | test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
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 3cd08c189..f86274d57 100644 --- a/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs +++ b/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs @@ -11,7 +11,7 @@ defmodule Pleroma.Web.MastodonAPI.ScheduledActivityControllerTest do 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"]) |