Update the tests

1 files changed, 47 insertions, 30 deletions

diff --git a/tests/cassettes/test_hashtag_tl.yaml b/tests/cassettes/test_hashtag_tl.yaml
index 8a349e6..353ba17 100644
--- a/tests/cassettes/test_hashtag_tl.yaml
+++ b/tests/cassettes/test_hashtag_tl.yaml
@@ -1,90 +1,107 @@
 interactions:
 - request:
-    body: visibility=&status=%23hoot+%28hashtag+toot%29
+    body: status=%23hoot+%28hashtag+toot%29
     headers:
       Accept: ['*/*']
       Accept-Encoding: ['gzip, deflate']
-      Authorization: [Bearer __MASTODON_PY_TEST_TOKEN]
+      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
       Connection: [keep-alive]
-      Content-Length: ['45']
+      Content-Length: ['33']
       Content-Type: [application/x-www-form-urlencoded]
-      User-Agent: [python-requests/2.18.4]
+      User-Agent: [python-requests/2.9.1]
     method: POST
     uri: http://localhost:3000/api/v1/statuses
   response:
-    body: {string: '{"id":"99074296373847415","created_at":"2017-11-27T03:36:29.893Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"mi","uri":"http://localhost:3000/users/admin/statuses/99074296373847415","content":"\u003cp\u003e\u003ca
+    body: {string: '{"id":"99882191242716858","created_at":"2018-04-18T19:54:47.328Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"mi","uri":"http://localhost:3000/users/mastodonpy_test/statuses/99882191242716858","content":"\u003cp\u003e\u003ca
         href=\"http://localhost:3000/tags/hoot\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003ehoot\u003c/span\u003e\u003c/a\u003e
-        (hashtag toot)\u003c/p\u003e","url":"http://localhost:3000/@admin/99074296373847415","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
-        test suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"codltest","locked":false,"created_at":"2017-07-01T17:09:15.621Z","note":"\u003cp\u003ehello
-        :)\u003c/p\u003e","url":"http://localhost:3000/@admin","avatar":"http://localhost:3000/system/accounts/avatars/000/000/001/original/99b4c443463de195.png","avatar_static":"http://localhost:3000/system/accounts/avatars/000/000/001/original/99b4c443463de195.png","header":"http://localhost:3000/headers/original/missing.png","header_static":"http://localhost:3000/headers/original/missing.png","followers_count":1,"following_count":0,"statuses_count":20},"media_attachments":[],"mentions":[],"tags":[{"name":"hoot","url":"http://localhost:3000/tags/hoot"}],"emojis":[]}'}
+        (hashtag toot)\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99882191242716858","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
+        test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+        Lennon","locked":true,"created_at":"2018-04-18T20:04:06.511Z","note":"\u003cp\u003eI
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","followers_count":0,"following_count":0,"statuses_count":21},"media_attachments":[],"mentions":[],"tags":[{"name":"hoot","url":"http://localhost:3000/tags/hoot"}],"emojis":[]}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"f60ff0be0aeee79d1a50e6be59aed1f2"]
+      ETag: [W/"63ab4bf7e3d35b3a3f762a8421c5985d"]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
       X-Content-Type-Options: [nosniff]
       X-Frame-Options: [SAMEORIGIN]
-      X-Request-Id: [07fe386d-da01-4b38-8a34-ed9d9c24890d]
-      X-Runtime: ['0.104177']
+      X-Request-Id: [d9d82f95-9bda-4b6d-bc69-042252d49822]
+      X-Runtime: ['0.337525']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['1425']
+      content-length: ['1606']
     status: {code: 200, message: OK}
 - request:
     body: null
     headers:
       Accept: ['*/*']
       Accept-Encoding: ['gzip, deflate']
-      Authorization: [Bearer __MASTODON_PY_TEST_TOKEN]
+      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
       Connection: [keep-alive]
-      User-Agent: [python-requests/2.18.4]
+      User-Agent: [python-requests/2.9.1]
     method: GET
     uri: http://localhost:3000/api/v1/timelines/tag/hoot
   response:
-    body: {string: '[{"id":"99074296373847415","created_at":"2017-11-27T03:36:29.893Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"mi","uri":"http://localhost:3000/users/admin/statuses/99074296373847415","content":"\u003cp\u003e\u003ca
+    body: {string: '[{"id":"99882191242716858","created_at":"2018-04-18T19:54:47.328Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"mi","uri":"http://localhost:3000/users/mastodonpy_test/statuses/99882191242716858","content":"\u003cp\u003e\u003ca
         href=\"http://localhost:3000/tags/hoot\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003ehoot\u003c/span\u003e\u003c/a\u003e
-        (hashtag toot)\u003c/p\u003e","url":"http://localhost:3000/@admin/99074296373847415","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
-        test suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"codltest","locked":false,"created_at":"2017-07-01T17:09:15.621Z","note":"\u003cp\u003ehello
-        :)\u003c/p\u003e","url":"http://localhost:3000/@admin","avatar":"http://localhost:3000/system/accounts/avatars/000/000/001/original/99b4c443463de195.png","avatar_static":"http://localhost:3000/system/accounts/avatars/000/000/001/original/99b4c443463de195.png","header":"http://localhost:3000/headers/original/missing.png","header_static":"http://localhost:3000/headers/original/missing.png","followers_count":1,"following_count":0,"statuses_count":20},"media_attachments":[],"mentions":[],"tags":[{"name":"hoot","url":"http://localhost:3000/tags/hoot"}],"emojis":[]}]'}
+        (hashtag toot)\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99882191242716858","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
+        test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+        Lennon","locked":true,"created_at":"2018-04-18T20:04:06.511Z","note":"\u003cp\u003eI
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","followers_count":0,"following_count":0,"statuses_count":21},"media_attachments":[],"mentions":[],"tags":[{"name":"hoot","url":"http://localhost:3000/tags/hoot"}],"emojis":[]},{"id":"99881900185916232","created_at":"2018-04-18T18:40:46.107Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"mi","uri":"http://localhost:3000/users/mastodonpy_test/statuses/99881900185916232","content":"\u003cp\u003e\u003ca
+        href=\"http://localhost:3000/tags/hoot\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003ehoot\u003c/span\u003e\u003c/a\u003e
+        (hashtag toot)\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99881900185916232","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
+        test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+        Lennon","locked":true,"created_at":"2018-04-18T20:04:06.511Z","note":"\u003cp\u003eI
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","followers_count":0,"following_count":0,"statuses_count":21},"media_attachments":[],"mentions":[],"tags":[{"name":"hoot","url":"http://localhost:3000/tags/hoot"}],"emojis":[]},{"id":"99881893369225896","created_at":"2018-04-18T18:39:02.107Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"mi","uri":"http://localhost:3000/users/mastodonpy_test/statuses/99881893369225896","content":"\u003cp\u003e\u003ca
+        href=\"http://localhost:3000/tags/hoot\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003ehoot\u003c/span\u003e\u003c/a\u003e
+        (hashtag toot)\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99881893369225896","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
+        test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+        Lennon","locked":true,"created_at":"2018-04-18T20:04:06.511Z","note":"\u003cp\u003eI
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","followers_count":0,"following_count":0,"statuses_count":21},"media_attachments":[],"mentions":[],"tags":[{"name":"hoot","url":"http://localhost:3000/tags/hoot"}],"emojis":[]},{"id":"99881886188502572","created_at":"2018-04-18T18:37:12.523Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"mi","uri":"http://localhost:3000/users/mastodonpy_test/statuses/99881886188502572","content":"\u003cp\u003e\u003ca
+        href=\"http://localhost:3000/tags/hoot\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003ehoot\u003c/span\u003e\u003c/a\u003e
+        (hashtag toot)\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99881886188502572","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
+        test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+        Lennon","locked":true,"created_at":"2018-04-18T20:04:06.511Z","note":"\u003cp\u003eI
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","followers_count":0,"following_count":0,"statuses_count":21},"media_attachments":[],"mentions":[],"tags":[{"name":"hoot","url":"http://localhost:3000/tags/hoot"}],"emojis":[]}]'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"0f7aee960cd49873868d4fd8da888d6d"]
-      Link: ['<http://localhost:3000/api/v1/timelines/tag/hoot?max_id=99074296373847415>;
-          rel="next", <http://localhost:3000/api/v1/timelines/tag/hoot?since_id=99074296373847415>;
+      ETag: [W/"241ac63441ecab61d989c8511beddf66"]
+      Link: ['<http://localhost:3000/api/v1/timelines/tag/hoot?max_id=99881886188502572>;
+          rel="next", <http://localhost:3000/api/v1/timelines/tag/hoot?since_id=99882191242716858>;
           rel="prev"']
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
       X-Content-Type-Options: [nosniff]
       X-Frame-Options: [SAMEORIGIN]
-      X-Request-Id: [169667bf-b799-4347-af75-cbc585297b82]
-      X-Runtime: ['0.067114']
+      X-Request-Id: [d9239537-5409-4e4f-9719-acf48dc59b17]
+      X-Runtime: ['0.170209']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['1427']
+      content-length: ['6429']
     status: {code: 200, message: OK}
 - request:
     body: null
     headers:
       Accept: ['*/*']
       Accept-Encoding: ['gzip, deflate']
-      Authorization: [Bearer __MASTODON_PY_TEST_TOKEN]
+      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
       Connection: [keep-alive]
       Content-Length: ['0']
-      User-Agent: [python-requests/2.18.4]
+      User-Agent: [python-requests/2.9.1]
     method: DELETE
-    uri: http://localhost:3000/api/v1/statuses/99074296373847415
+    uri: http://localhost:3000/api/v1/statuses/99882191242716858
   response:
     body: {string: '{}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"612eb80804af851684b89190dee9562c"]
+      ETag: [W/"eff8a8f025c57a603434d84fc8875c77"]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
       X-Content-Type-Options: [nosniff]
       X-Frame-Options: [SAMEORIGIN]
-      X-Request-Id: [92588be3-0129-48be-8894-a6e6d0043159]
-      X-Runtime: ['0.018806']
+      X-Request-Id: [085d7883-eb20-47ac-92f0-68ab8404ec4c]
+      X-Runtime: ['0.058677']
       X-XSS-Protection: [1; mode=block]
       content-length: ['2']
     status: {code: 200, message: OK}