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/fixtures | |
| parent | 300d94c62829d0ec961f3ed6c0242dea102ab0ad (diff) | |
| parent | f8d4c02431aa634dc74074b93d1cb522e47056ce (diff) | |
| download | pleroma-65db5e9f528a3f8d8b3c81953fd160a6744dfffd.tar.gz pleroma-65db5e9f528a3f8d8b3c81953fd160a6744dfffd.zip | |
Resolve merge conflicts
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/rich_media/ogp-missing-data.html | 8 | ||||
| -rw-r--r-- | test/fixtures/rich_media/ogp.html | 1 | ||||
| -rw-r--r-- | test/fixtures/sound.mp3 | bin | 0 -> 521 bytes |
3 files changed, 9 insertions, 0 deletions
diff --git a/test/fixtures/rich_media/ogp-missing-data.html b/test/fixtures/rich_media/ogp-missing-data.html new file mode 100644 index 000000000..5746dc2f4 --- /dev/null +++ b/test/fixtures/rich_media/ogp-missing-data.html @@ -0,0 +1,8 @@ +<html prefix="og: http://ogp.me/ns#"> + <head> + <title>Pleroma</title> + <meta property="og:title" content="Pleroma" /> + <meta property="og:type" content="website" /> + <meta property="og:url" content="https://pleroma.social/" /> + </head> +</html> diff --git a/test/fixtures/rich_media/ogp.html b/test/fixtures/rich_media/ogp.html index c886b5871..4b5a33595 100644 --- a/test/fixtures/rich_media/ogp.html +++ b/test/fixtures/rich_media/ogp.html @@ -5,5 +5,6 @@ <meta property="og:type" content="video.movie" /> <meta property="og:url" content="http://www.imdb.com/title/tt0117500/" /> <meta property="og:image" content="http://ia.media-imdb.com/images/rock.jpg" /> + <meta property="og:description" content="Directed by Michael Bay. With Sean Connery, Nicolas Cage, Ed Harris, John Spencer."> </head> </html> diff --git a/test/fixtures/sound.mp3 b/test/fixtures/sound.mp3 Binary files differnew file mode 100644 index 000000000..9f0f661a3 --- /dev/null +++ b/test/fixtures/sound.mp3 |