1 files changed, 38 insertions, 42 deletions

diff --git a/tests/cassettes/test_polls.yaml b/tests/cassettes/test_polls.yaml
index 6132074..c4700a4 100644
--- a/tests/cassettes/test_polls.yaml
+++ b/tests/cassettes/test_polls.yaml
@@ -13,13 +13,12 @@ interactions:
     method: POST
     uri: http://localhost:3000/api/v1/statuses
   response:
-    body: {string: '{"id":"102005835265128615","created_at":"2019-04-28T21:05:23.464Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost/users/admin/statuses/102005835265128615","content":"\u003cp\u003enice\u003c/p\u003e","url":"http://localhost/@admin/102005835265128615","replies_count":0,"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":"","locked":false,"bot":false,"created_at":"2019-04-27T18:52:42.626Z","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":25,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":{"id":"15","expires_at":"2019-04-28T21:10:23.457Z","expired":false,"multiple":true,"votes_count":0,"voted":true,"options":[{"title":"four
+    body: {string: '{"id":"102315367762013469","created_at":"2019-06-22T13:03:34.554Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost/users/admin/statuses/102315367762013469","url":"http://localhost/@admin/102315367762013469","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"content":"\u003cp\u003enice\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":0,"following_count":0,"statuses_count":1,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":{"id":"1","expires_at":"2019-06-22T13:08:34.543Z","expired":false,"multiple":true,"votes_count":0,"voted":true,"options":[{"title":"four
         twenty","votes_count":0},{"title":"sixty-nine","votes_count":0}],"emojis":[]}}'}
     headers:
-      Cache-Control: ['max-age=0, private, must-revalidate']
+      Cache-Control: ['no-cache, no-store']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"9b51d6b8d66f9e0eb1c833ed6f67df71"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -27,10 +26,10 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [f11d8fa0-461a-446e-a0f5-20b81af7f6cc]
-      X-Runtime: ['0.157309']
+      X-Request-Id: [eff31aa8-bda7-408b-8260-bc592dc9bbd4]
+      X-Runtime: ['0.223254']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['1382']
+      content-length: ['1380']
     status: {code: 200, message: OK}
 - request:
     body: choices%5B%5D=1
@@ -43,14 +42,13 @@ interactions:
       Content-Type: [application/x-www-form-urlencoded]
       User-Agent: [python-requests/2.18.4]
     method: POST
-    uri: http://localhost:3000/api/v1/polls/15/votes
+    uri: http://localhost:3000/api/v1/polls/1/votes
   response:
-    body: {string: '{"id":"15","expires_at":"2019-04-28T21:10:23.457Z","expired":false,"multiple":true,"votes_count":1,"voted":true,"options":[{"title":"four
+    body: {string: '{"id":"1","expires_at":"2019-06-22T13:08:34.543Z","expired":false,"multiple":true,"votes_count":1,"voted":true,"options":[{"title":"four
         twenty","votes_count":0},{"title":"sixty-nine","votes_count":1}],"emojis":[]}'}
     headers:
-      Cache-Control: ['max-age=0, private, must-revalidate']
+      Cache-Control: ['no-cache, no-store']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"5b2a849b672ccadf70a2620d4dc1cacb"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -58,10 +56,10 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [9bfef151-c9a3-44cc-94d4-6ed33e9e7c24]
-      X-Runtime: ['0.079564']
+      X-Request-Id: [08c8efb8-8ee3-4087-b9f7-25ba1335b593]
+      X-Runtime: ['0.077040']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['215']
+      content-length: ['214']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -72,14 +70,13 @@ interactions:
       Connection: [keep-alive]
       User-Agent: [python-requests/2.18.4]
     method: GET
-    uri: http://localhost:3000/api/v1/polls/15
+    uri: http://localhost:3000/api/v1/polls/1
   response:
-    body: {string: '{"id":"15","expires_at":"2019-04-28T21:10:23.457Z","expired":false,"multiple":true,"votes_count":1,"voted":true,"options":[{"title":"four
+    body: {string: '{"id":"1","expires_at":"2019-06-22T13:08:34.543Z","expired":false,"multiple":true,"votes_count":1,"voted":true,"options":[{"title":"four
         twenty","votes_count":0},{"title":"sixty-nine","votes_count":1}],"emojis":[]}'}
     headers:
-      Cache-Control: ['max-age=0, private, must-revalidate']
+      Cache-Control: ['no-cache, no-store']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"5b2a849b672ccadf70a2620d4dc1cacb"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -87,10 +84,10 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [f6a54825-bd65-49b0-a83f-39ef5124a362]
-      X-Runtime: ['0.043202']
+      X-Request-Id: [39703b78-72bb-4bda-8f3d-ecc0fa9a3645]
+      X-Runtime: ['0.035297']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['215']
+      content-length: ['214']
     status: {code: 200, message: OK}
 - request:
     body: choices%5B%5D=0
@@ -103,14 +100,13 @@ interactions:
       Content-Type: [application/x-www-form-urlencoded]
       User-Agent: [python-requests/2.18.4]
     method: POST
-    uri: http://localhost:3000/api/v1/polls/15/votes
+    uri: http://localhost:3000/api/v1/polls/1/votes
   response:
-    body: {string: '{"id":"15","expires_at":"2019-04-28T21:10:23.457Z","expired":false,"multiple":true,"votes_count":2,"voted":true,"options":[{"title":"four
+    body: {string: '{"id":"1","expires_at":"2019-06-22T13:08:34.543Z","expired":false,"multiple":true,"votes_count":2,"voted":true,"options":[{"title":"four
         twenty","votes_count":1},{"title":"sixty-nine","votes_count":1}],"emojis":[]}'}
     headers:
-      Cache-Control: ['max-age=0, private, must-revalidate']
+      Cache-Control: ['no-cache, no-store']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"567f9562c02e1a5533bf95d1d4bbdede"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -118,10 +114,10 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [209f0950-c9c0-4ab8-978f-de3239546a97]
-      X-Runtime: ['0.062952']
+      X-Request-Id: [da03e008-863c-4d49-8c64-37fb93d629a0]
+      X-Runtime: ['0.043669']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['215']
+      content-length: ['214']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -132,14 +128,13 @@ interactions:
       Connection: [keep-alive]
       User-Agent: [python-requests/2.18.4]
     method: GET
-    uri: http://localhost:3000/api/v1/polls/15
+    uri: http://localhost:3000/api/v1/polls/1
   response:
-    body: {string: '{"id":"15","expires_at":"2019-04-28T21:10:23.457Z","expired":false,"multiple":true,"votes_count":2,"voted":true,"options":[{"title":"four
+    body: {string: '{"id":"1","expires_at":"2019-06-22T13:08:34.543Z","expired":false,"multiple":true,"votes_count":2,"voted":true,"options":[{"title":"four
         twenty","votes_count":1},{"title":"sixty-nine","votes_count":1}],"emojis":[]}'}
     headers:
-      Cache-Control: ['max-age=0, private, must-revalidate']
+      Cache-Control: ['no-cache, no-store']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"567f9562c02e1a5533bf95d1d4bbdede"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -147,10 +142,10 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [7caa443c-5605-436f-bae1-f7088dc7db1d]
-      X-Runtime: ['0.037629']
+      X-Request-Id: [ee710e5b-2403-45bd-97ca-0f2edcd70797]
+      X-Runtime: ['0.024792']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['215']
+      content-length: ['214']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -162,13 +157,14 @@ interactions:
       Content-Length: ['0']
       User-Agent: [python-requests/2.18.4]
     method: DELETE
-    uri: http://localhost:3000/api/v1/statuses/102005835265128615
+    uri: http://localhost:3000/api/v1/statuses/102315367762013469
   response:
-    body: {string: '{}'}
+    body: {string: '{"id":"102315367762013469","created_at":"2019-06-22T13:03:34.554Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost/users/admin/statuses/102315367762013469","url":"http://localhost/@admin/102315367762013469","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"text":"nice","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":0,"following_count":0,"statuses_count":1,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":{"id":"1","expires_at":"2019-06-22T13:08:34.543Z","expired":false,"multiple":true,"votes_count":2,"voted":true,"options":[{"title":"four
+        twenty","votes_count":1},{"title":"sixty-nine","votes_count":1}],"emojis":[]}}'}
     headers:
-      Cache-Control: ['max-age=0, private, must-revalidate']
+      Cache-Control: ['no-cache, no-store']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"6e856267241253766a52970611e7487c"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -176,9 +172,9 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [9a5591f2-fbaa-4f0e-832f-86f5d1b8e6b1]
-      X-Runtime: ['0.044707']
+      X-Request-Id: [f5f1d50a-0185-482f-bfde-6b9ab6d97dfa]
+      X-Runtime: ['0.084331']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['2']
+      content-length: ['1350']
     status: {code: 200, message: OK}
 version: 1