From d99650270b980c006690a7051a2d5cffe07779f1 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Fri, 25 Jan 2019 20:38:54 +0300 Subject: [#534] Federation reachability filtering tests. --- test/support/factory.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/support') diff --git a/test/support/factory.ex b/test/support/factory.ex index 4ac77981a..964b2b61c 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -193,7 +193,7 @@ defmodule Pleroma.Factory do def websub_subscription_factory do %Pleroma.Web.Websub.WebsubServerSubscription{ topic: "http://example.org", - callback: "http://example/org/callback", + callback: "http://example.org/callback", secret: "here's a secret", valid_until: NaiveDateTime.add(NaiveDateTime.utc_now(), 100), state: "requested" -- cgit v1.2.3 From 1d2f41642cfec5710055bcf8409778bb362beecb Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Mon, 28 Jan 2019 15:25:06 +0300 Subject: [#534] Various tweaks. Tests for Instances and Instance. --- test/support/factory.ex | 7 +++++++ test/support/http_request_mock.ex | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) (limited to 'test/support') diff --git a/test/support/factory.ex b/test/support/factory.ex index 964b2b61c..0c21093ce 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -220,4 +220,11 @@ defmodule Pleroma.Factory do client_secret: "aaa;/&bbb" } end + + def instance_factory do + %Pleroma.Instances.Instance{ + host: "domain.com", + unreachable_since: nil + } + end end diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index e4279e14d..3d6efd52c 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -653,6 +653,14 @@ defmodule HttpRequestMock do {:ok, Tesla.Mock.json(%{"id" => "https://social.heldscal.la/user/23211"}, status: 200)} end + def get("http://404.site" <> _, _, _, _) do + {:ok, + %Tesla.Env{ + status: 404, + body: "" + }} + end + def get(url, query, body, headers) do {:error, "Not implemented the mock response for get #{inspect(url)}, #{query}, #{inspect(body)}, #{ @@ -673,6 +681,26 @@ defmodule HttpRequestMock do }} end + def post("http://200.site" <> _, _, _, _) do + {:ok, + %Tesla.Env{ + status: 200, + body: "" + }} + end + + def post("http://connrefused.site" <> _, _, _, _) do + {:error, :connrefused} + end + + def post("http://404.site" <> _, _, _, _) do + {:ok, + %Tesla.Env{ + status: 404, + body: "" + }} + end + def post(url, _query, _body, _headers) do {:error, "Not implemented the mock response for post #{inspect(url)}"} end -- cgit v1.2.3 From 4e76f9fde1f13c001f11d8184a9d75894461f881 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 31 Jan 2019 16:12:35 +0000 Subject: test: add malformed OGP data fixture --- test/support/http_request_mock.ex | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'test/support') diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index 3043d2be6..e9f5bbb88 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -657,6 +657,10 @@ defmodule HttpRequestMock do {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/ogp.html")}} end + def get("http://example.com/malformed", _, _, _) do + {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/malformed-data.html")}} + end + def get("http://example.com/empty", _, _, _) do {:ok, %Tesla.Env{status: 200, body: "hello"}} end -- cgit v1.2.3 From 106475f265f1d36c28c22361616d7e95ae96d674 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 31 Jan 2019 16:30:56 +0000 Subject: test: http mocks: formatting --- test/support/http_request_mock.ex | 53 +++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 11 deletions(-) (limited to 'test/support') diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index e9f5bbb88..c60f61873 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -143,7 +143,10 @@ defmodule HttpRequestMock do }} end - def get("https://squeet.me/xrd/?uri=lain@squeet.me", _, _, + def get( + "https://squeet.me/xrd/?uri=lain@squeet.me", + _, + _, Accept: "application/xrd+xml,application/jrd+json" ) do {:ok, @@ -153,7 +156,10 @@ defmodule HttpRequestMock do }} end - def get("https://mst3k.interlinked.me/users/luciferMysticus", _, _, + def get( + "https://mst3k.interlinked.me/users/luciferMysticus", + _, + _, Accept: "application/activity+json" ) do {:ok, @@ -171,7 +177,10 @@ defmodule HttpRequestMock do }} end - def get("https://hubzilla.example.org/channel/kaniini", _, _, + def get( + "https://hubzilla.example.org/channel/kaniini", + _, + _, Accept: "application/activity+json" ) do {:ok, @@ -248,7 +257,10 @@ defmodule HttpRequestMock do }} end - def get("http://mastodon.example.org/@admin/99541947525187367", _, _, + def get( + "http://mastodon.example.org/@admin/99541947525187367", + _, + _, Accept: "application/activity+json" ) do {:ok, @@ -274,7 +286,10 @@ defmodule HttpRequestMock do }} end - def get("https://mstdn.io/users/mayuutann/statuses/99568293732299394", _, _, + def get( + "https://mstdn.io/users/mayuutann/statuses/99568293732299394", + _, + _, Accept: "application/activity+json" ) do {:ok, @@ -429,7 +444,10 @@ defmodule HttpRequestMock do }} end - def get("https://social.sakamoto.gq/objects/0ccc1a2c-66b0-4305-b23a-7f7f2b040056", _, _, + def get( + "https://social.sakamoto.gq/objects/0ccc1a2c-66b0-4305-b23a-7f7f2b040056", + _, + _, Accept: "application/atom+xml" ) do {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/httpoison_mock/sakamoto.atom")}} @@ -510,7 +528,10 @@ defmodule HttpRequestMock do %Tesla.Env{status: 200, body: File.read!("test/fixtures/httpoison_mock/squeet.me_host_meta")}} end - def get("https://squeet.me/xrd?uri=lain@squeet.me", _, _, + def get( + "https://squeet.me/xrd?uri=lain@squeet.me", + _, + _, Accept: "application/xrd+xml,application/jrd+json" ) do {:ok, @@ -541,7 +562,10 @@ defmodule HttpRequestMock do }} end - def get("http://framatube.org/main/xrd?uri=framasoft@framatube.org", _, _, + def get( + "http://framatube.org/main/xrd?uri=framasoft@framatube.org", + _, + _, Accept: "application/xrd+xml,application/jrd+json" ) do {:ok, @@ -560,7 +584,10 @@ defmodule HttpRequestMock do }} end - def get("http://gnusocial.de/main/xrd?uri=winterdienst@gnusocial.de", _, _, + def get( + "http://gnusocial.de/main/xrd?uri=winterdienst@gnusocial.de", + _, + _, Accept: "application/xrd+xml,application/jrd+json" ) do {:ok, @@ -594,7 +621,10 @@ defmodule HttpRequestMock do }} end - def get("https://gerzilla.de/xrd/?uri=kaniini@gerzilla.de", _, _, + def get( + "https://gerzilla.de/xrd/?uri=kaniini@gerzilla.de", + _, + _, Accept: "application/xrd+xml,application/jrd+json" ) do {:ok, @@ -658,7 +688,8 @@ defmodule HttpRequestMock do end def get("http://example.com/malformed", _, _, _) do - {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/malformed-data.html")}} + {:ok, + %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/malformed-data.html")}} end def get("http://example.com/empty", _, _, _) do -- cgit v1.2.3 From e61f0be9518aff867f4c56f5102723eddbcf40f1 Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 3 Feb 2019 18:54:39 +0100 Subject: Unbreak all the tests. --- test/support/conn_case.ex | 1 + test/support/data_case.ex | 1 + 2 files changed, 2 insertions(+) (limited to 'test/support') diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex index c201d9a9b..ec5892ff5 100644 --- a/test/support/conn_case.ex +++ b/test/support/conn_case.ex @@ -33,6 +33,7 @@ defmodule Pleroma.Web.ConnCase do setup tags do Cachex.clear(:user_cache) + Cachex.clear(:object_cache) :ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo) unless tags[:async] do diff --git a/test/support/data_case.ex b/test/support/data_case.ex index 56d5896ad..df260bd3f 100644 --- a/test/support/data_case.ex +++ b/test/support/data_case.ex @@ -32,6 +32,7 @@ defmodule Pleroma.DataCase do setup tags do Cachex.clear(:user_cache) + Cachex.clear(:object_cache) :ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo) unless tags[:async] do -- cgit v1.2.3