Not used mock See merge request pleroma/pleroma!3313youtube-fix
@@ -1,41 +0,0 @@ | |||
{ | |||
"@context": [ | |||
"https://www.w3.org/ns/activitystreams", | |||
"http://localhost:4001/schemas/litepub-0.1.jsonld", | |||
{ | |||
"@language": "und" | |||
} | |||
], | |||
"attachment": [], | |||
"endpoints": { | |||
"oauthAuthorizationEndpoint": "http://localhost:4001/oauth/authorize", | |||
"oauthRegistrationEndpoint": "http://localhost:4001/api/v1/apps", | |||
"oauthTokenEndpoint": "http://localhost:4001/oauth/token", | |||
"sharedInbox": "http://localhost:4001/inbox" | |||
}, | |||
"followers": "http://localhost:4001/users/{{nickname}}/followers", | |||
"following": "http://localhost:4001/users/{{nickname}}/following", | |||
"icon": { | |||
"type": "Image", | |||
"url": "http://localhost:4001/media/4e914f5b84e4a259a3f6c2d2edc9ab642f2ab05f3e3d9c52c81fc2d984b3d51e.jpg" | |||
}, | |||
"id": "http://localhost:4001/users/{{nickname}}", | |||
"image": { | |||
"type": "Image", | |||
"url": "http://localhost:4001/media/f739efddefeee49c6e67e947c4811fdc911785c16ae43da4c3684051fbf8da6a.jpg?name=f739efddefeee49c6e67e947c4811fdc911785c16ae43da4c3684051fbf8da6a.jpg" | |||
}, | |||
"inbox": "http://localhost:4001/users/{{nickname}}/inbox", | |||
"manuallyApprovesFollowers": false, | |||
"name": "{{nickname}}", | |||
"outbox": "http://localhost:4001/users/{{nickname}}/outbox", | |||
"preferredUsername": "{{nickname}}", | |||
"publicKey": { | |||
"id": "http://localhost:4001/users/{{nickname}}#main-key", | |||
"owner": "http://localhost:4001/users/{{nickname}}", | |||
"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5DLtwGXNZElJyxFGfcVc\nXANhaMadj/iYYQwZjOJTV9QsbtiNBeIK54PJrYuU0/0YIdrvS1iqheX5IwXRhcwa\nhm3ZyLz7XeN9st7FBni4BmZMBtMpxAuYuu5p/jbWy13qAiYOhPreCx0wrWgm/lBD\n9mkgaxIxPooBE0S4ZWEJIDIV1Vft3AWcRUyWW1vIBK0uZzs6GYshbQZB952S0yo4\nFzI1hABGHncH8UvuFauh4EZ8tY7/X5I0pGRnDOcRN1dAht5w5yTA+6r5kebiFQjP\nIzN/eCO/a9Flrj9YGW7HDNtjSOH0A31PLRGlJtJO3yK57dnf5ppyCZGfL4emShQo\ncQIDAQAB\n-----END PUBLIC KEY-----\n\n" | |||
}, | |||
"summary": "your friendly neighborhood pleroma developer<br>I like cute things and distributed systems, and really hate delete and redrafts", | |||
"tag": [], | |||
"type": "Person", | |||
"url": "http://localhost:4001/users/{{nickname}}" | |||
} |
@@ -990,7 +990,6 @@ defmodule Pleroma.NotificationTest do | |||
assert Enum.empty?(Notification.for_user(local_user)) | |||
end | |||
@tag capture_log: true | |||
test "move activity generates a notification" do | |||
%{ap_id: old_ap_id} = old_user = insert(:user) | |||
%{ap_id: new_ap_id} = new_user = insert(:user, also_known_as: [old_ap_id]) | |||
@@ -1000,18 +999,6 @@ defmodule Pleroma.NotificationTest do | |||
User.follow(follower, old_user) | |||
User.follow(other_follower, old_user) | |||
old_user_url = old_user.ap_id | |||
body = | |||
File.read!("test/fixtures/users_mock/localhost.json") | |||
|> String.replace("{{nickname}}", old_user.nickname) | |||
|> Jason.encode!() | |||
Tesla.Mock.mock(fn | |||
%{method: :get, url: ^old_user_url} -> | |||
%Tesla.Env{status: 200, body: body} | |||
end) | |||
Pleroma.Web.ActivityPub.ActivityPub.move(old_user, new_user) | |||
ObanHelpers.perform_all() | |||
@@ -555,24 +555,11 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do | |||
assert length(json_response_and_validate_schema(conn, 200)) == 1 | |||
end | |||
@tag capture_log: true | |||
test "see move notifications" do | |||
old_user = insert(:user) | |||
new_user = insert(:user, also_known_as: [old_user.ap_id]) | |||
%{user: follower, conn: conn} = oauth_access(["read:notifications"]) | |||
old_user_url = old_user.ap_id | |||
body = | |||
File.read!("test/fixtures/users_mock/localhost.json") | |||
|> String.replace("{{nickname}}", old_user.nickname) | |||
|> Jason.encode!() | |||
Tesla.Mock.mock(fn | |||
%{method: :get, url: ^old_user_url} -> | |||
%Tesla.Env{status: 200, body: body} | |||
end) | |||
User.follow(follower, old_user) | |||
Pleroma.Web.ActivityPub.ActivityPub.move(old_user, new_user) | |||
Pleroma.Tests.ObanHelpers.perform_all() | |||
@@ -144,24 +144,11 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do | |||
refute Repo.one(Notification) | |||
end | |||
@tag capture_log: true | |||
test "Move notification" do | |||
old_user = insert(:user) | |||
new_user = insert(:user, also_known_as: [old_user.ap_id]) | |||
follower = insert(:user) | |||
old_user_url = old_user.ap_id | |||
body = | |||
File.read!("test/fixtures/users_mock/localhost.json") | |||
|> String.replace("{{nickname}}", old_user.nickname) | |||
|> Jason.encode!() | |||
Tesla.Mock.mock(fn | |||
%{method: :get, url: ^old_user_url} -> | |||
%Tesla.Env{status: 200, body: body} | |||
end) | |||
User.follow(follower, old_user) | |||
Pleroma.Web.ActivityPub.ActivityPub.move(old_user, new_user) | |||
Pleroma.Tests.ObanHelpers.perform_all() | |||
@@ -383,19 +383,8 @@ defmodule Pleroma.Web.StreamerTest do | |||
user: user, | |||
token: oauth_token | |||
} do | |||
user_url = user.ap_id | |||
user2 = insert(:user) | |||
body = | |||
File.read!("test/fixtures/users_mock/localhost.json") | |||
|> String.replace("{{nickname}}", user.nickname) | |||
|> Jason.encode!() | |||
Tesla.Mock.mock_global(fn | |||
%{method: :get, url: ^user_url} -> | |||
%Tesla.Env{status: 200, body: body} | |||
end) | |||
Streamer.get_topic_and_add_socket("user:notification", user, oauth_token) | |||
{:ok, _follower, _followed, follow_activity} = CommonAPI.follow(user2, user) | |||
@@ -409,20 +398,9 @@ defmodule Pleroma.Web.StreamerTest do | |||
token: oauth_token | |||
} do | |||
user_id = user.id | |||
user_url = user.ap_id | |||
other_user = insert(:user) | |||
other_user_id = other_user.id | |||
body = | |||
File.read!("test/fixtures/users_mock/localhost.json") | |||
|> String.replace("{{nickname}}", user.nickname) | |||
|> Jason.encode!() | |||
Tesla.Mock.mock_global(fn | |||
%{method: :get, url: ^user_url} -> | |||
%Tesla.Env{status: 200, body: body} | |||
end) | |||
Streamer.get_topic_and_add_socket("user", user, oauth_token) | |||
{:ok, _follower, _followed, _follow_activity} = CommonAPI.follow(user, other_user) | |||