Make test output easier to read.
This commit is contained in:
parent
33a5d0a238
commit
26ccb768d3
@ -21,4 +21,4 @@ before_script:
|
|||||||
unit-testing:
|
unit-testing:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- MIX_ENV=test mix test
|
- MIX_ENV=test mix test --trace
|
||||||
|
@ -32,7 +32,7 @@ defmodule Pleroma.Stats do
|
|||||||
domain_count = Enum.count(peers)
|
domain_count = Enum.count(peers)
|
||||||
status_query = from(u in User.local_user_query,
|
status_query = from(u in User.local_user_query,
|
||||||
select: fragment("sum((?->>'note_count')::int)", u.info))
|
select: fragment("sum((?->>'note_count')::int)", u.info))
|
||||||
status_count = Repo.one(status_query) |> IO.inspect
|
status_count = Repo.one(status_query)
|
||||||
user_count = Repo.aggregate(User.local_user_query, :count, :id)
|
user_count = Repo.aggregate(User.local_user_query, :count, :id)
|
||||||
Agent.update(__MODULE__, fn _ ->
|
Agent.update(__MODULE__, fn _ ->
|
||||||
{peers, %{domain_count: domain_count, status_count: status_count, user_count: user_count}}
|
{peers, %{domain_count: domain_count, status_count: status_count, user_count: user_count}}
|
||||||
|
@ -50,7 +50,7 @@ defmodule Pleroma.NotificationTest do
|
|||||||
|
|
||||||
{:ok, activity} = TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"})
|
{:ok, activity} = TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"})
|
||||||
{:ok, [notification]} = Notification.create_notifications(activity)
|
{:ok, [notification]} = Notification.create_notifications(activity)
|
||||||
{:error, notification} = Notification.get(user, notification.id)
|
{:error, _notification} = Notification.get(user, notification.id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -72,7 +72,7 @@ defmodule Pleroma.NotificationTest do
|
|||||||
|
|
||||||
{:ok, activity} = TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"})
|
{:ok, activity} = TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"})
|
||||||
{:ok, [notification]} = Notification.create_notifications(activity)
|
{:ok, [notification]} = Notification.create_notifications(activity)
|
||||||
{:error, notification} = Notification.dismiss(user, notification.id)
|
{:error, _notification} = Notification.dismiss(user, notification.id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ defmodule Pleroma.ObjectTest do
|
|||||||
cs = Object.change(%Object{}, %{data: %{id: object.data["id"]}})
|
cs = Object.change(%Object{}, %{data: %{id: object.data["id"]}})
|
||||||
assert cs.valid?
|
assert cs.valid?
|
||||||
|
|
||||||
{:error, result} = Repo.insert(cs)
|
{:error, _result} = Repo.insert(cs)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -326,7 +326,7 @@ defmodule Pleroma.UserTest do
|
|||||||
assert [addressed] == User.get_recipients_from_activity(activity)
|
assert [addressed] == User.get_recipients_from_activity(activity)
|
||||||
|
|
||||||
{:ok, user} = User.follow(user, actor)
|
{:ok, user} = User.follow(user, actor)
|
||||||
{:ok, user_two} = User.follow(user_two, actor)
|
{:ok, _user_two} = User.follow(user_two, actor)
|
||||||
recipients = User.get_recipients_from_activity(activity)
|
recipients = User.get_recipients_from_activity(activity)
|
||||||
assert length(recipients) == 2
|
assert length(recipients) == 2
|
||||||
assert user in recipients
|
assert user in recipients
|
||||||
|
@ -110,7 +110,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
|
|||||||
|
|
||||||
describe "public fetch activities" do
|
describe "public fetch activities" do
|
||||||
test "retrieves public activities" do
|
test "retrieves public activities" do
|
||||||
activities = ActivityPub.fetch_public_activities
|
_activities = ActivityPub.fetch_public_activities
|
||||||
|
|
||||||
%{public: public} = ActivityBuilder.public_and_non_public
|
%{public: public} = ActivityBuilder.public_and_non_public
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||||||
alias Pleroma.Web.{OStatus, CommonAPI}
|
alias Pleroma.Web.{OStatus, CommonAPI}
|
||||||
|
|
||||||
import Pleroma.Factory
|
import Pleroma.Factory
|
||||||
|
import ExUnit.CaptureLog
|
||||||
|
|
||||||
test "the home timeline", %{conn: conn} do
|
test "the home timeline", %{conn: conn} do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
@ -31,23 +32,25 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||||||
test "the public timeline", %{conn: conn} do
|
test "the public timeline", %{conn: conn} do
|
||||||
following = insert(:user)
|
following = insert(:user)
|
||||||
|
|
||||||
{:ok, _activity} = TwitterAPI.create_status(following, %{"status" => "test"})
|
capture_log fn ->
|
||||||
{:ok, [_activity]} = OStatus.fetch_activity_from_url("https://shitposter.club/notice/2827873")
|
{:ok, _activity} = TwitterAPI.create_status(following, %{"status" => "test"})
|
||||||
|
{:ok, [_activity]} = OStatus.fetch_activity_from_url("https://shitposter.club/notice/2827873")
|
||||||
|
|
||||||
conn = conn
|
conn = conn
|
||||||
|> get("/api/v1/timelines/public", %{"local" => "False"})
|
|> get("/api/v1/timelines/public", %{"local" => "False"})
|
||||||
|
|
||||||
assert length(json_response(conn, 200)) == 2
|
assert length(json_response(conn, 200)) == 2
|
||||||
|
|
||||||
conn = build_conn()
|
conn = build_conn()
|
||||||
|> get("/api/v1/timelines/public", %{"local" => "True"})
|
|> get("/api/v1/timelines/public", %{"local" => "True"})
|
||||||
|
|
||||||
assert [%{"content" => "test"}] = json_response(conn, 200)
|
assert [%{"content" => "test"}] = json_response(conn, 200)
|
||||||
|
|
||||||
conn = build_conn()
|
conn = build_conn()
|
||||||
|> get("/api/v1/timelines/public", %{"local" => "1"})
|
|> get("/api/v1/timelines/public", %{"local" => "1"})
|
||||||
|
|
||||||
assert [%{"content" => "test"}] = json_response(conn, 200)
|
assert [%{"content" => "test"}] = json_response(conn, 200)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
test "posting a status", %{conn: conn} do
|
test "posting a status", %{conn: conn} do
|
||||||
@ -144,7 +147,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||||||
other_user = insert(:user)
|
other_user = insert(:user)
|
||||||
|
|
||||||
{:ok, activity} = TwitterAPI.create_status(other_user, %{"status" => "hi @#{user.nickname}"})
|
{:ok, activity} = TwitterAPI.create_status(other_user, %{"status" => "hi @#{user.nickname}"})
|
||||||
{:ok, [notification]} = Notification.create_notifications(activity)
|
{:ok, [_notification]} = Notification.create_notifications(activity)
|
||||||
|
|
||||||
conn = conn
|
conn = conn
|
||||||
|> assign(:user, user)
|
|> assign(:user, user)
|
||||||
@ -190,7 +193,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||||||
other_user = insert(:user)
|
other_user = insert(:user)
|
||||||
|
|
||||||
{:ok, activity} = TwitterAPI.create_status(other_user, %{"status" => "hi @#{user.nickname}"})
|
{:ok, activity} = TwitterAPI.create_status(other_user, %{"status" => "hi @#{user.nickname}"})
|
||||||
{:ok, [notification]} = Notification.create_notifications(activity)
|
{:ok, [_notification]} = Notification.create_notifications(activity)
|
||||||
|
|
||||||
conn = conn
|
conn = conn
|
||||||
|> assign(:user, user)
|
|> assign(:user, user)
|
||||||
@ -338,15 +341,16 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||||||
test "hashtag timeline", %{conn: conn} do
|
test "hashtag timeline", %{conn: conn} do
|
||||||
following = insert(:user)
|
following = insert(:user)
|
||||||
|
|
||||||
{:ok, activity} = TwitterAPI.create_status(following, %{"status" => "test #2hu"})
|
capture_log fn ->
|
||||||
{:ok, [_activity]} = OStatus.fetch_activity_from_url("https://shitposter.club/notice/2827873")
|
{:ok, activity} = TwitterAPI.create_status(following, %{"status" => "test #2hu"})
|
||||||
|
{:ok, [_activity]} = OStatus.fetch_activity_from_url("https://shitposter.club/notice/2827873")
|
||||||
|
conn = conn
|
||||||
|
|> get("/api/v1/timelines/tag/2hu")
|
||||||
|
|
||||||
conn = conn
|
assert [%{"id" => id}] = json_response(conn, 200)
|
||||||
|> get("/api/v1/timelines/tag/2hu")
|
|
||||||
|
|
||||||
assert [%{"id" => id}] = json_response(conn, 200)
|
assert id == to_string(activity.id)
|
||||||
|
end
|
||||||
assert id == to_string(activity.id)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
test "getting followers", %{conn: conn} do
|
test "getting followers", %{conn: conn} do
|
||||||
@ -381,14 +385,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||||||
|> assign(:user, user)
|
|> assign(:user, user)
|
||||||
|> post("/api/v1/accounts/#{other_user.id}/follow")
|
|> post("/api/v1/accounts/#{other_user.id}/follow")
|
||||||
|
|
||||||
assert %{"id" => id, "following" => true} = json_response(conn, 200)
|
assert %{"id" => _id, "following" => true} = json_response(conn, 200)
|
||||||
|
|
||||||
user = Repo.get(User, user.id)
|
user = Repo.get(User, user.id)
|
||||||
conn = build_conn()
|
conn = build_conn()
|
||||||
|> assign(:user, user)
|
|> assign(:user, user)
|
||||||
|> post("/api/v1/accounts/#{other_user.id}/unfollow")
|
|> post("/api/v1/accounts/#{other_user.id}/unfollow")
|
||||||
|
|
||||||
assert %{"id" => id, "following" => false} = json_response(conn, 200)
|
assert %{"id" => _id, "following" => false} = json_response(conn, 200)
|
||||||
|
|
||||||
user = Repo.get(User, user.id)
|
user = Repo.get(User, user.id)
|
||||||
conn = build_conn()
|
conn = build_conn()
|
||||||
@ -407,14 +411,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||||||
|> assign(:user, user)
|
|> assign(:user, user)
|
||||||
|> post("/api/v1/accounts/#{other_user.id}/block")
|
|> post("/api/v1/accounts/#{other_user.id}/block")
|
||||||
|
|
||||||
assert %{"id" => id, "blocking" => true} = json_response(conn, 200)
|
assert %{"id" => _id, "blocking" => true} = json_response(conn, 200)
|
||||||
|
|
||||||
user = Repo.get(User, user.id)
|
user = Repo.get(User, user.id)
|
||||||
conn = build_conn()
|
conn = build_conn()
|
||||||
|> assign(:user, user)
|
|> assign(:user, user)
|
||||||
|> post("/api/v1/accounts/#{other_user.id}/unblock")
|
|> post("/api/v1/accounts/#{other_user.id}/unblock")
|
||||||
|
|
||||||
assert %{"id" => id, "blocking" => false} = json_response(conn, 200)
|
assert %{"id" => _id, "blocking" => false} = json_response(conn, 200)
|
||||||
end
|
end
|
||||||
|
|
||||||
test "getting a list of blocks", %{conn: conn} do
|
test "getting a list of blocks", %{conn: conn} do
|
||||||
@ -461,7 +465,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||||||
|
|
||||||
test "account search", %{conn: conn} do
|
test "account search", %{conn: conn} do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
user_two = insert(:user, %{nickname: "shp@shitposter.club"})
|
_user_two = insert(:user, %{nickname: "shp@shitposter.club"})
|
||||||
user_three = insert(:user, %{nickname: "shp@heldscal.la", name: "I love 2hu"})
|
user_three = insert(:user, %{nickname: "shp@heldscal.la", name: "I love 2hu"})
|
||||||
|
|
||||||
conn = conn
|
conn = conn
|
||||||
@ -495,12 +499,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||||||
end
|
end
|
||||||
|
|
||||||
test "search fetches remote statuses", %{conn: conn} do
|
test "search fetches remote statuses", %{conn: conn} do
|
||||||
conn = conn
|
capture_log fn ->
|
||||||
|> get("/api/v1/search", %{"q" => "https://shitposter.club/notice/2827873"})
|
conn = conn
|
||||||
assert results = json_response(conn, 200)
|
|> get("/api/v1/search", %{"q" => "https://shitposter.club/notice/2827873"})
|
||||||
|
assert results = json_response(conn, 200)
|
||||||
|
|
||||||
[status] = results["statuses"]
|
[status] = results["statuses"]
|
||||||
assert status["uri"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
|
assert status["uri"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
test "search fetches remote accounts", %{conn: conn} do
|
test "search fetches remote accounts", %{conn: conn} do
|
||||||
|
@ -96,7 +96,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
|
|||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
object = Object.get_cached_by_ap_id(note.data["object"]["id"])
|
object = Object.get_cached_by_ap_id(note.data["object"]["id"])
|
||||||
|
|
||||||
{:ok, announce, object} = ActivityPub.announce(user, object)
|
{:ok, announce, _object} = ActivityPub.announce(user, object)
|
||||||
|
|
||||||
announce = Repo.get(Activity, announce.id)
|
announce = Repo.get(Activity, announce.id)
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ defmodule Pleroma.Web.OStatus.DeleteHandlingTest do
|
|||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
object = Object.get_by_ap_id(note.data["object"]["id"])
|
object = Object.get_by_ap_id(note.data["object"]["id"])
|
||||||
|
|
||||||
{:ok, like, object} = Pleroma.Web.ActivityPub.ActivityPub.like(user, object)
|
{:ok, like, _object} = Pleroma.Web.ActivityPub.ActivityPub.like(user, object)
|
||||||
|
|
||||||
incoming = File.read!("test/fixtures/delete.xml")
|
incoming = File.read!("test/fixtures/delete.xml")
|
||||||
|> String.replace("tag:mastodon.sdf.org,2017-06-10:objectId=310513:objectType=Status", note.data["object"]["id"])
|
|> String.replace("tag:mastodon.sdf.org,2017-06-10:objectId=310513:objectType=Status", note.data["object"]["id"])
|
||||||
|
@ -84,10 +84,3 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
|
|||||||
assert response(conn, 200)
|
assert response(conn, 200)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defmodule Pleroma.Web.OStatusMock do
|
|
||||||
import Pleroma.Factory
|
|
||||||
def handle_incoming(_doc) do
|
|
||||||
insert(:note_activity)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
@ -4,6 +4,7 @@ defmodule Pleroma.Web.OStatusTest do
|
|||||||
alias Pleroma.Web.XML
|
alias Pleroma.Web.XML
|
||||||
alias Pleroma.{Object, Repo, User, Activity}
|
alias Pleroma.{Object, Repo, User, Activity}
|
||||||
import Pleroma.Factory
|
import Pleroma.Factory
|
||||||
|
import ExUnit.CaptureLog
|
||||||
|
|
||||||
test "don't insert create notes twice" do
|
test "don't insert create notes twice" do
|
||||||
incoming = File.read!("test/fixtures/incoming_note_activity.xml")
|
incoming = File.read!("test/fixtures/incoming_note_activity.xml")
|
||||||
@ -91,7 +92,7 @@ defmodule Pleroma.Web.OStatusTest do
|
|||||||
|
|
||||||
test "handle incoming retweets - Mastodon, with CW" do
|
test "handle incoming retweets - Mastodon, with CW" do
|
||||||
incoming = File.read!("test/fixtures/cw_retweet.xml")
|
incoming = File.read!("test/fixtures/cw_retweet.xml")
|
||||||
{:ok, [[activity, retweeted_activity]]} = OStatus.handle_incoming(incoming)
|
{:ok, [[_activity, retweeted_activity]]} = OStatus.handle_incoming(incoming)
|
||||||
|
|
||||||
assert retweeted_activity.data["object"]["summary"] == "Hey."
|
assert retweeted_activity.data["object"]["summary"] == "Hey."
|
||||||
end
|
end
|
||||||
@ -168,19 +169,21 @@ defmodule Pleroma.Web.OStatusTest do
|
|||||||
end
|
end
|
||||||
|
|
||||||
test "handle incoming favorites - GS, websub" do
|
test "handle incoming favorites - GS, websub" do
|
||||||
incoming = File.read!("test/fixtures/favorite.xml")
|
capture_log fn ->
|
||||||
{:ok, [[activity, favorited_activity]]} = OStatus.handle_incoming(incoming)
|
incoming = File.read!("test/fixtures/favorite.xml")
|
||||||
|
{:ok, [[activity, favorited_activity]]} = OStatus.handle_incoming(incoming)
|
||||||
|
|
||||||
assert activity.data["type"] == "Like"
|
assert activity.data["type"] == "Like"
|
||||||
assert activity.data["actor"] == "https://social.heldscal.la/user/23211"
|
assert activity.data["actor"] == "https://social.heldscal.la/user/23211"
|
||||||
assert activity.data["object"] == favorited_activity.data["object"]["id"]
|
assert activity.data["object"] == favorited_activity.data["object"]["id"]
|
||||||
assert activity.data["id"] == "tag:social.heldscal.la,2017-05-05:fave:23211:comment:2061643:2017-05-05T09:12:50+00:00"
|
assert activity.data["id"] == "tag:social.heldscal.la,2017-05-05:fave:23211:comment:2061643:2017-05-05T09:12:50+00:00"
|
||||||
|
|
||||||
refute activity.local
|
refute activity.local
|
||||||
assert favorited_activity.data["type"] == "Create"
|
assert favorited_activity.data["type"] == "Create"
|
||||||
assert favorited_activity.data["actor"] == "https://shitposter.club/user/1"
|
assert favorited_activity.data["actor"] == "https://shitposter.club/user/1"
|
||||||
assert favorited_activity.data["object"]["id"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
|
assert favorited_activity.data["object"]["id"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
|
||||||
refute favorited_activity.local
|
refute favorited_activity.local
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
test "handle conversation references" do
|
test "handle conversation references" do
|
||||||
@ -335,11 +338,13 @@ defmodule Pleroma.Web.OStatusTest do
|
|||||||
|
|
||||||
describe "fetching a status by it's HTML url" do
|
describe "fetching a status by it's HTML url" do
|
||||||
test "it builds a missing status from an html url" do
|
test "it builds a missing status from an html url" do
|
||||||
url = "https://shitposter.club/notice/2827873"
|
capture_log fn ->
|
||||||
{:ok, [activity] } = OStatus.fetch_activity_from_url(url)
|
url = "https://shitposter.club/notice/2827873"
|
||||||
|
{:ok, [activity] } = OStatus.fetch_activity_from_url(url)
|
||||||
|
|
||||||
assert activity.data["actor"] == "https://shitposter.club/user/1"
|
assert activity.data["actor"] == "https://shitposter.club/user/1"
|
||||||
assert activity.data["object"]["id"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
|
assert activity.data["object"]["id"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
test "it works for atom notes, too" do
|
test "it works for atom notes, too" do
|
||||||
|
@ -35,7 +35,7 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
|
|||||||
end
|
end
|
||||||
|
|
||||||
test "it decodes a friendica public key" do
|
test "it decodes a friendica public key" do
|
||||||
key = Salmon.decode_key(@magickey_friendica)
|
_key = Salmon.decode_key(@magickey_friendica)
|
||||||
end
|
end
|
||||||
|
|
||||||
test "returns a public and private key from a pem" do
|
test "returns a public and private key from a pem" do
|
||||||
@ -90,7 +90,7 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
|
|||||||
user = Repo.get_by(User, ap_id: activity.data["actor"])
|
user = Repo.get_by(User, ap_id: activity.data["actor"])
|
||||||
{:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)
|
{:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)
|
||||||
|
|
||||||
poster = fn (url, data, headers, options) ->
|
poster = fn (url, _data, _headers, _options) ->
|
||||||
assert url == "http://example.org/salmon"
|
assert url == "http://example.org/salmon"
|
||||||
end
|
end
|
||||||
Salmon.publish(user, activity, poster)
|
Salmon.publish(user, activity, poster)
|
||||||
|
@ -147,7 +147,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
|
|||||||
follower = insert(:user)
|
follower = insert(:user)
|
||||||
followed = insert(:user)
|
followed = insert(:user)
|
||||||
|
|
||||||
{:ok, follow} = ActivityPub.follow(follower, followed)
|
{:ok, _follow} = ActivityPub.follow(follower, followed)
|
||||||
{:ok, unfollow} = ActivityPub.unfollow(follower, followed)
|
{:ok, unfollow} = ActivityPub.unfollow(follower, followed)
|
||||||
|
|
||||||
map = ActivityRepresenter.to_map(unfollow, %{user: follower})
|
map = ActivityRepresenter.to_map(unfollow, %{user: follower})
|
||||||
|
@ -504,7 +504,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|
|||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
follower_one = insert(:user)
|
follower_one = insert(:user)
|
||||||
follower_two = insert(:user)
|
follower_two = insert(:user)
|
||||||
not_follower = insert(:user)
|
_not_follower = insert(:user)
|
||||||
|
|
||||||
{:ok, follower_one} = User.follow(follower_one, user)
|
{:ok, follower_one} = User.follow(follower_one, user)
|
||||||
{:ok, follower_two} = User.follow(follower_two, user)
|
{:ok, follower_two} = User.follow(follower_two, user)
|
||||||
@ -522,7 +522,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|
|||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
followed_one = insert(:user)
|
followed_one = insert(:user)
|
||||||
followed_two = insert(:user)
|
followed_two = insert(:user)
|
||||||
not_followed = insert(:user)
|
_not_followed = insert(:user)
|
||||||
|
|
||||||
{:ok, user} = User.follow(user, followed_one)
|
{:ok, user} = User.follow(user, followed_one)
|
||||||
{:ok, user} = User.follow(user, followed_two)
|
{:ok, user} = User.follow(user, followed_two)
|
||||||
@ -538,7 +538,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|
|||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
followed_one = insert(:user)
|
followed_one = insert(:user)
|
||||||
followed_two = insert(:user)
|
followed_two = insert(:user)
|
||||||
not_followed = insert(:user)
|
_not_followed = insert(:user)
|
||||||
|
|
||||||
{:ok, user} = User.follow(user, followed_one)
|
{:ok, user} = User.follow(user, followed_one)
|
||||||
{:ok, user} = User.follow(user, followed_two)
|
{:ok, user} = User.follow(user, followed_two)
|
||||||
@ -553,7 +553,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|
|||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
followed_one = insert(:user)
|
followed_one = insert(:user)
|
||||||
followed_two = insert(:user)
|
followed_two = insert(:user)
|
||||||
not_followed = insert(:user)
|
_not_followed = insert(:user)
|
||||||
|
|
||||||
{:ok, user} = User.follow(user, followed_one)
|
{:ok, user} = User.follow(user, followed_one)
|
||||||
{:ok, user} = User.follow(user, followed_two)
|
{:ok, user} = User.follow(user, followed_two)
|
||||||
@ -570,7 +570,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|
|||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
followed_one = insert(:user)
|
followed_one = insert(:user)
|
||||||
followed_two = insert(:user)
|
followed_two = insert(:user)
|
||||||
not_followed = insert(:user)
|
_not_followed = insert(:user)
|
||||||
|
|
||||||
{:ok, user} = User.follow(user, followed_one)
|
{:ok, user} = User.follow(user, followed_one)
|
||||||
{:ok, user} = User.follow(user, followed_two)
|
{:ok, user} = User.follow(user, followed_two)
|
||||||
|
@ -247,7 +247,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
|||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
User.block(user, unblocked)
|
User.block(user, unblocked)
|
||||||
|
|
||||||
{:ok, user, unblocked} = TwitterAPI.unblock(user, %{"user_id" => unblocked.id})
|
{:ok, user, _unblocked} = TwitterAPI.unblock(user, %{"user_id" => unblocked.id})
|
||||||
assert user.info["blocks"] == []
|
assert user.info["blocks"] == []
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -256,7 +256,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
|||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
User.block(user, unblocked)
|
User.block(user, unblocked)
|
||||||
|
|
||||||
{:ok, user, unblocked} = TwitterAPI.unblock(user, %{"screen_name" => unblocked.nickname})
|
{:ok, user, _unblocked} = TwitterAPI.unblock(user, %{"screen_name" => unblocked.nickname})
|
||||||
assert user.info["blocks"] == []
|
assert user.info["blocks"] == []
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
|
|||||||
assert represented == UserView.render("show.json", %{user: follower, for: user})
|
assert represented == UserView.render("show.json", %{user: follower, for: user})
|
||||||
end
|
end
|
||||||
|
|
||||||
test "A blocked user for the blocker", %{user: user} do
|
test "A blocked user for the blocker" do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
blocker = insert(:user)
|
blocker = insert(:user)
|
||||||
User.block(blocker, user)
|
User.block(blocker, user)
|
||||||
|
@ -42,8 +42,7 @@ defmodule Pleroma.Web.WebFingerTest do
|
|||||||
test "it works for friendica" do
|
test "it works for friendica" do
|
||||||
user = "lain@squeet.me"
|
user = "lain@squeet.me"
|
||||||
|
|
||||||
{:ok, data} = WebFinger.finger(user)
|
{:ok, _data} = WebFinger.finger(user)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
test "it gets the xrd endpoint" do
|
test "it gets the xrd endpoint" do
|
||||||
|
@ -74,10 +74,3 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do
|
|||||||
assert length(Repo.all(Activity)) == 0
|
assert length(Repo.all(Activity)) == 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defmodule Pleroma.Web.OStatusMock do
|
|
||||||
import Pleroma.Factory
|
|
||||||
def handle_incoming(_doc) do
|
|
||||||
insert(:note_activity)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
@ -174,7 +174,7 @@ defmodule Pleroma.Web.WebsubTest do
|
|||||||
signed = Websub.sign("secret", "text")
|
signed = Websub.sign("secret", "text")
|
||||||
assert signed == "B8392C23690CCF871F37EC270BE1582DEC57A503" |> String.downcase
|
assert signed == "B8392C23690CCF871F37EC270BE1582DEC57A503" |> String.downcase
|
||||||
|
|
||||||
signed = Websub.sign("secret", [["て"], ['す']])
|
_signed = Websub.sign("secret", [["て"], ['す']])
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "renewing subscriptions" do
|
describe "renewing subscriptions" do
|
||||||
@ -184,7 +184,7 @@ defmodule Pleroma.Web.WebsubTest do
|
|||||||
still_good = insert(:websub_client_subscription, %{valid_until: NaiveDateTime.add(now, 2 * day), topic: "http://example.org/still_good", state: "accepted"})
|
still_good = insert(:websub_client_subscription, %{valid_until: NaiveDateTime.add(now, 2 * day), topic: "http://example.org/still_good", state: "accepted"})
|
||||||
needs_refresh = insert(:websub_client_subscription, %{valid_until: NaiveDateTime.add(now, day - 100), topic: "http://example.org/needs_refresh", state: "accepted"})
|
needs_refresh = insert(:websub_client_subscription, %{valid_until: NaiveDateTime.add(now, day - 100), topic: "http://example.org/needs_refresh", state: "accepted"})
|
||||||
|
|
||||||
refresh = Websub.refresh_subscriptions()
|
_refresh = Websub.refresh_subscriptions()
|
||||||
|
|
||||||
assert still_good == Repo.get(WebsubClientSubscription, still_good.id)
|
assert still_good == Repo.get(WebsubClientSubscription, still_good.id)
|
||||||
refute needs_refresh == Repo.get(WebsubClientSubscription, needs_refresh.id)
|
refute needs_refresh == Repo.get(WebsubClientSubscription, needs_refresh.id)
|
||||||
|
Loading…
Reference in New Issue
Block a user