Update the tests

1 files changed, 26 insertions, 28 deletions

diff --git a/tests/cassettes/test_log_in_password_to_file.yaml b/tests/cassettes/test_log_in_password_to_file.yaml
index 32abfdc..8b22fe5 100644
--- a/tests/cassettes/test_log_in_password_to_file.yaml
+++ b/tests/cassettes/test_log_in_password_to_file.yaml
@@ -1,54 +1,52 @@
 interactions:
 - request:
-    body: !!python/unicode username=admin%40localhost%3A3000&password=mastodonadmin&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&client_id=__MASTODON_PY_TEST_CLIENT_ID&scope=read+write+follow&client_secret=__MASTODON_PY_TEST_CLIENT_SECRET&grant_type=password
+    body: grant_type=password&client_secret=__MASTODON_PY_TEST_CLIENT_SECRET&password=mastodonadmin&client_id=__MASTODON_PY_TEST_CLIENT_ID&scope=read+write+follow&username=admin%40localhost%3A3000&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob
     headers:
       Accept: ['*/*']
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['235']
       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/oauth/token
   response:
-    body: {string: !!python/unicode '{"access_token":"__MASTODON_PY_TEST_ACCESS_TOKEN_2","token_type":"bearer","scope":"read
-        write follow","created_at":1511992220}'}
+    body: {string: '{"access_token":"__MASTODON_PY_TEST_ACCESS_TOKEN_2","token_type":"bearer","scope":"read
+        write follow","created_at":1524081846}'}
     headers:
-      cache-control: [no-store]
+      Cache-Control: [no-store]
+      Content-Type: [application/json; charset=utf-8]
+      ETag: [W/"1b348b4c9ce263bf9ba07b556ffecf02"]
+      Pragma: [no-cache]
+      Transfer-Encoding: [chunked]
+      Vary: ['Accept-Encoding, Origin']
+      X-Request-Id: [cb8db004-603c-444c-96c2-ca66860e519d]
+      X-Runtime: ['0.246367']
       content-length: ['126']
-      content-type: [application/json; charset=utf-8]
-      etag: [W/"d69940161df215958096efeb1a959d12"]
-      pragma: [no-cache]
-      transfer-encoding: [chunked]
-      vary: ['Accept-Encoding, Origin']
-      x-request-id: [a05d2bef-1d32-4857-97b5-6cc4136dfd29]
-      x-runtime: ['0.205660']
     status: {code: 200, message: OK}
 - request:
     body: null
     headers:
       Accept: ['*/*']
       Accept-Encoding: ['gzip, deflate']
-      Authorization: [!!python/unicode Bearer __MASTODON_PY_TEST_ACCESS_TOKEN_2]
+      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN_2]
       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/accounts/verify_credentials
   response:
-    body: {string: !!python/unicode '{"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":50,"source":{"privacy":"public","sensitive":false,"note":"hello
-        :)"}}'}
+    body: {string: '{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"created_at":"2018-04-17T21:40:55.626Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost:3000/@admin","avatar":"http://localhost:3000/avatars/original/missing.png","avatar_static":"http://localhost:3000/avatars/original/missing.png","header":"http://localhost:3000/headers/original/missing.png","header_static":"http://localhost:3000/headers/original/missing.png","followers_count":0,"following_count":0,"statuses_count":20,"source":{"privacy":"public","sensitive":false,"note":""}}'}
     headers:
-      cache-control: ['max-age=0, private, must-revalidate']
-      content-length: ['669']
-      content-type: [application/json; charset=utf-8]
-      etag: [W/"05183e2c68a77cfb9877fc356465a322"]
-      transfer-encoding: [chunked]
-      vary: ['Accept-Encoding, Origin']
-      x-content-type-options: [nosniff]
-      x-frame-options: [SAMEORIGIN]
-      x-request-id: [0cdc8a2f-6deb-4437-bd96-4e7178e1b9cd]
-      x-runtime: ['0.230997']
-      x-xss-protection: [1; mode=block]
+      Cache-Control: ['max-age=0, private, must-revalidate']
+      Content-Type: [application/json; charset=utf-8]
+      ETag: [W/"7dd90ea85246ecc8842438a59da3a088"]
+      Transfer-Encoding: [chunked]
+      Vary: ['Accept-Encoding, Origin']
+      X-Content-Type-Options: [nosniff]
+      X-Frame-Options: [SAMEORIGIN]
+      X-Request-Id: [394d5b9b-5748-4d7c-873f-d885de10f51f]
+      X-Runtime: ['0.038229']
+      X-XSS-Protection: [1; mode=block]
+      content-length: ['571']
     status: {code: 200, message: OK}
 version: 1