aboutsummaryrefslogtreecommitdiff
path: root/test/web/twitter_api/twitter_api_controller_test.exs
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-03-08 12:29:02 +0000
committerlambda <pleromagit@rogerbraun.net>2018-03-08 12:29:02 +0000
commit460062f2b04220ffcd8f20aa842cc95582d1f849 (patch)
treef56c298bed6b289aa2dd81766862265ccef05947 /test/web/twitter_api/twitter_api_controller_test.exs
parent0f2bf3eefb0adba13a3f3d37e8d8b1bd414a33e4 (diff)
parent611ca385dea3d611a97579000311cc42684305e6 (diff)
downloadpleroma-460062f2b04220ffcd8f20aa842cc95582d1f849.tar.gz
Merge branch 'feature/activitypub' into 'develop'
Feature/activitypub See merge request pleroma/pleroma!67
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
-rw-r--r--test/web/twitter_api/twitter_api_controller_test.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index f02e2c59e..d3040f0dc 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -376,9 +376,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
end
test "with credentials", %{conn: conn, user: current_user} do
+ avatar_image = File.read!("test/fixtures/avatar_data_uri")
conn = conn
|> with_credentials(current_user.nickname, "test")
- |> post("/api/qvitter/update_avatar.json", %{img: Pleroma.Web.ActivityPub.ActivityPubTest.data_uri})
+ |> post("/api/qvitter/update_avatar.json", %{img: avatar_image})
current_user = Repo.get(User, current_user.id)
assert is_map(current_user.avatar)