summaryrefslogtreecommitdiff
path: root/test/web/activity_pub/activity_pub_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-13 08:12:09 +0000
committerlain <lain@soykaf.club>2020-05-13 08:12:09 +0000
commita5ccb5b0b1032b102c54d4df2e17c61423089e73 (patch)
tree48f8014dbdd9deb8b9aae1d894344c039c203918 /test/web/activity_pub/activity_pub_controller_test.exs
parenta6283bbae13a873af969336bd4e62011777a1a70 (diff)
parent2906cbbd40ea07c2ceb4d67e1c889cc7ab8b7662 (diff)
downloadpleroma-a5ccb5b0b1032b102c54d4df2e17c61423089e73.tar.gz
pleroma-a5ccb5b0b1032b102c54d4df2e17c61423089e73.zip
Merge branch 'release/2.0.5' into 'stable'
Release/2.0.5 See merge request pleroma/secteam/pleroma!4
Diffstat (limited to 'test/web/activity_pub/activity_pub_controller_test.exs')
-rw-r--r--test/web/activity_pub/activity_pub_controller_test.exs4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs
index c418232da..153adc703 100644
--- a/test/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/web/activity_pub/activity_pub_controller_test.exs
@@ -310,7 +310,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
end
describe "/inbox" do
+ clear_config([:instance, :user_bio_length])
+
test "it inserts an incoming activity into the database", %{conn: conn} do
+ Pleroma.Config.put([:instance, :user_bio_length], 1)
+
data = File.read!("test/fixtures/mastodon-post-activity.json") |> Poison.decode!()
conn =