diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-08-27 08:29:25 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-08-27 08:29:25 +0000 |
| commit | 46c7c2380c9f923b6c9e1521b025fd45aed0ae37 (patch) | |
| tree | b68eb17204a86f61dba574ad7376a4891dd262b6 /test | |
| parent | 440b459cd14778e155cd6a3550847b1277fbd1f1 (diff) | |
| parent | 0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8 (diff) | |
| download | pleroma-46c7c2380c9f923b6c9e1521b025fd45aed0ae37.tar.gz pleroma-46c7c2380c9f923b6c9e1521b025fd45aed0ae37.zip | |
Merge branch 'feature/relay' into 'develop'
message relay
Closes #144
See merge request pleroma/pleroma!264
Diffstat (limited to 'test')
| -rw-r--r-- | test/user_test.exs | 2 | ||||
| -rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/user_test.exs b/test/user_test.exs index 352a16687..5c61b0930 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -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? diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index 3a035e298..87bcdaf71 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -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}) |