diff options
author | rinpatch <rinpatch@sdf.org> | 2019-06-01 16:29:58 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-06-01 16:29:58 +0300 |
commit | 65db5e9f528a3f8d8b3c81953fd160a6744dfffd (patch) | |
tree | 9da5234f8a9dd411b59e839eeb38254822939e2f /test/support/http_request_mock.ex | |
parent | 300d94c62829d0ec961f3ed6c0242dea102ab0ad (diff) | |
parent | f8d4c02431aa634dc74074b93d1cb522e47056ce (diff) | |
download | pleroma-65db5e9f528a3f8d8b3c81953fd160a6744dfffd.tar.gz pleroma-65db5e9f528a3f8d8b3c81953fd160a6744dfffd.zip |
Resolve merge conflicts
Diffstat (limited to 'test/support/http_request_mock.ex')
-rw-r--r-- | test/support/http_request_mock.ex | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index 3064c032b..36b9265e7 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -736,6 +736,14 @@ defmodule HttpRequestMock do {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/ogp.html")}} end + def get("http://example.com/ogp-missing-data", _, _, _) do + {:ok, + %Tesla.Env{ + status: 200, + body: File.read!("test/fixtures/rich_media/ogp-missing-data.html") + }} + end + def get("http://example.com/malformed", _, _, _) do {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/malformed-data.html")}} |