hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/relay' into 'develop'

Browse source 
message relay

Closes #144

See merge request pleroma/pleroma!264
This commit is contained in:
lambda 2018-08-27 08:29:25 +00:00
commit 46c7c2380c
13 changed files with 202 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/user_test.exs
View file

@ -220,7 +220,7 @@ defmodule Pleroma.UserTest do
end
test "it has required fields" do
[:name, :nickname, :ap_id]
[:name, :ap_id]
|> Enum.each(fn field ->
cs = User.remote_user_creation(Map.delete(@valid_remote, field))
refute cs.valid?

3
test/web/twitter_api/twitter_api_controller_test.exs
View file

@ -77,7 +77,8 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
conn = conn_with_creds |> post(request_path, %{status: " "})
assert json_response(conn, 400) == error_response
conn = conn_with_creds |> post(request_path, %{status: "Nice meme."})
# we post with visibility private in order to avoid triggering relay
conn = conn_with_creds |> post(request_path, %{status: "Nice meme.", visibility: "private"})
assert json_response(conn, 200) ==
ActivityRepresenter.to_map(Repo.one(Activity), %{user: user})