From 4f90728a4a8c98f3ee7e9aab5a05f93c152a375d Mon Sep 17 00:00:00 2001 From: Lorenz Diener Date: Sat, 22 Feb 2020 20:31:33 +0100 Subject: Fix tests for 3.1.1 --- tests/cassettes/test_stream_direct.yaml | 35 ++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'tests/cassettes/test_stream_direct.yaml') diff --git a/tests/cassettes/test_stream_direct.yaml b/tests/cassettes/test_stream_direct.yaml index 7969848..07a860f 100644 --- a/tests/cassettes/test_stream_direct.yaml +++ b/tests/cassettes/test_stream_direct.yaml @@ -10,12 +10,12 @@ interactions: method: GET uri: http://localhost:3000/api/v1/instance/ response: - body: {string: '{"uri":"localhost","title":"Mastodon","short_description":"","description":"","email":"","version":"3.0.1","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":3,"status_count":35,"domain_count":0},"thumbnail":"http://localhost/packs/media/images/preview-9a17d32fc48369e8ccd910a75260e67d.jpg","languages":["en"],"registrations":true,"approval_required":false,"contact_account":null}'} + body: {string: '{"uri":"localhost","title":"Mastodon","short_description":"","description":"","email":"","version":"3.1.1","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":3,"status_count":5,"domain_count":0},"thumbnail":"http://localhost/packs/media/images/preview-9a17d32fc48369e8ccd910a75260e67d.jpg","languages":["en"],"registrations":true,"approval_required":false,"contact_account":null}'} headers: Cache-Control: ['max-age=180, public'] Content-Type: [application/json; charset=utf-8] - Date: ['Sat, 12 Oct 2019 21:02:19 GMT'] - ETag: [W/"ff826cf42bb295e7dd0d367a9e8291cb"] + Date: ['Sat, 22 Feb 2020 19:30:30 GMT'] + ETag: [W/"51587391c411617410e169d0ce505880"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -23,10 +23,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [05953499-e17b-4c5a-bf6b-60a185e2df3b] - X-Runtime: ['0.034994'] + X-Request-Id: [aeccbf84-349a-4394-be58-83af49fd2a57] + X-Runtime: ['0.055290'] X-XSS-Protection: [1; mode=block] - content-length: ['398'] + content-length: ['397'] status: {code: 200, message: OK} - request: body: visibility=direct&status=%40mastodonpy_test+todo+funny+text+here @@ -41,11 +41,11 @@ interactions: method: POST uri: http://localhost:3000/api/v1/statuses response: - body: {string: '{"id":"102951429389872972","created_at":"2019-10-12T21:02:24.756Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"direct","language":"en","uri":"http://localhost/users/admin/statuses/102951429389872972","url":"http://localhost/@admin/102951429389872972","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"content":"\u003cp\u003e\u003cspan + body: {string: '{"id":"103704155604374665","created_at":"2020-02-22T19:30:35.304Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"direct","language":"en","uri":"http://localhost/users/admin/statuses/103704155604374665","url":"http://localhost/@admin/103704155604374665","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"content":"\u003cp\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost/@mastodonpy_test\" class=\"u-url mention\"\u003e@\u003cspan\u003emastodonpy_test\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e todo funny text here\u003c/p\u003e","reblog":null,"application":{"name":"Mastodon.py - test suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T12:42:50.096Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@admin","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":2,"following_count":1,"statuses_count":33,"last_status_at":"2019-10-12T21:01:45.075Z","emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"1234567890123456","username":"mastodonpy_test","url":"http://localhost/@mastodonpy_test","acct":"mastodonpy_test"}],"tags":[],"emojis":[],"card":null,"poll":null}'} + test suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2020-02-22T19:13:53.944Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@admin","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":0,"following_count":0,"statuses_count":3,"last_status_at":"2020-02-22","emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"1234567890123456","username":"mastodonpy_test","url":"http://localhost/@mastodonpy_test","acct":"mastodonpy_test"}],"tags":[],"emojis":[],"card":null,"poll":null}'} headers: Cache-Control: ['no-cache, no-store'] Content-Type: [application/json; charset=utf-8] @@ -56,10 +56,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [3fa3f705-4295-4b3d-8daf-045241521e5f] - X-Runtime: ['0.223443'] + X-Request-Id: [eb31d98b-c1c6-4e75-b11a-3fc21f206b6b] + X-Runtime: ['0.246356'] X-XSS-Protection: [1; mode=block] - content-length: ['1531'] + content-length: ['1569'] status: {code: 200, message: OK} - request: body: null @@ -72,12 +72,14 @@ interactions: method: GET uri: http://localhost:4000/api/v1/streaming/direct response: - body: {string: 'event: conversation + body: {string: ':) - data: {"id":"42","unread":true,"accounts":[{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T12:42:50.096Z","note":"

","url":"http://localhost/@admin","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":2,"following_count":1,"statuses_count":33,"last_status_at":"2019-10-12T21:01:45.075Z","emojis":[],"fields":[]}],"last_status":{"id":"102951429389872972","created_at":"2019-10-12T21:02:24.756Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"direct","language":"en","uri":"http://localhost/users/admin/statuses/102951429389872972","url":"http://localhost/@admin/102951429389872972","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"content":"

","url":"http://localhost/@admin","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":0,"following_count":0,"statuses_count":3,"last_status_at":"2020-02-22","emojis":[],"fields":[]}],"last_status":{"id":"103704155604374665","created_at":"2020-02-22T19:30:35.304Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"direct","language":"en","uri":"http://localhost/users/admin/statuses/103704155604374665","url":"http://localhost/@admin/103704155604374665","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"content":"

@mastodonpy_test todo funny text here

","reblog":null,"application":{"name":"Mastodon.py - test suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T12:42:50.096Z","note":"

","url":"http://localhost/@admin","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":2,"following_count":1,"statuses_count":33,"last_status_at":"2019-10-12T21:01:45.075Z","emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"1234567890123456","username":"mastodonpy_test","url":"http://localhost/@mastodonpy_test","acct":"mastodonpy_test"}],"tags":[],"emojis":[],"card":null,"poll":null}} + test suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2020-02-22T19:13:53.944Z","note":"

","url":"http://localhost/@admin","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":0,"following_count":0,"statuses_count":3,"last_status_at":"2020-02-22","emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"1234567890123456","username":"mastodonpy_test","url":"http://localhost/@mastodonpy_test","acct":"mastodonpy_test"}],"tags":[],"emojis":[],"card":null,"poll":null}} :'} @@ -85,11 +87,12 @@ interactions: Access-Control-Allow-Headers: ['Authorization, Accept, Cache-Control'] Access-Control-Allow-Methods: ['GET, OPTIONS'] Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-store] Connection: [keep-alive] Content-Type: [text/event-stream] - Date: ['Sat, 12 Oct 2019 21:02:25 GMT'] + Date: ['Sat, 22 Feb 2020 19:30:30 GMT'] Transfer-Encoding: [chunked] X-Powered-By: [Express] - X-Request-Id: [170c81f2-1f6a-401d-bf84-12bafefc7984] + X-Request-Id: [254a2c3c-5131-44b1-ad76-128a348475c9] status: {code: 200, message: OK} version: 1 -- cgit v1.2.3