1 files changed, 8 insertions, 58 deletions

diff --git a/tests/cassettes/test_log_in_password_to_file.yaml b/tests/cassettes/test_log_in_password_to_file.yaml
index f9c4f31..903f7cb 100644
--- a/tests/cassettes/test_log_in_password_to_file.yaml
+++ b/tests/cassettes/test_log_in_password_to_file.yaml
@@ -1,6 +1,6 @@
 interactions:
 - request:
-    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
+    body: username=admin%40localhost%3A3000&scope=read+write+follow&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&grant_type=password&client_id=__MASTODON_PY_TEST_CLIENT_ID&password=mastodonadmin&client_secret=__MASTODON_PY_TEST_CLIENT_SECRET
     headers:
       Accept: ['*/*']
       Accept-Encoding: ['gzip, deflate']
@@ -16,12 +16,12 @@ interactions:
     headers:
       Cache-Control: [no-store]
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"1b348b4c9ce263bf9ba07b556ffecf02"]
+      ETag: [W/"3146bc67569d7c9f332f4bcd447a1d3f"]
       Pragma: [no-cache]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
-      X-Request-Id: [cb8db004-603c-444c-96c2-ca66860e519d]
-      X-Runtime: ['0.246367']
+      X-Request-Id: [63d67f55-d234-4bec-83be-15b5dd799313]
+      X-Runtime: ['0.128303']
       content-length: ['126']
     status: {code: 200, message: OK}
 - request:
@@ -35,67 +35,17 @@ interactions:
     method: GET
     uri: http://localhost:3000/api/v1/accounts/verify_credentials
   response:
-    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":""}}'}
+    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":38,"source":{"privacy":"public","sensitive":false,"note":""}}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"7dd90ea85246ecc8842438a59da3a088"]
+      ETag: [W/"4744ac665ec260e0cf2992419ea025df"]
       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}
-- request:
-    body: password=mastodonadmin&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&username=admin%40localhost%3A3000&client_secret=__MASTODON_PY_TEST_CLIENT_SECRET&scope=read+write+follow&grant_type=password&client_id=__MASTODON_PY_TEST_CLIENT_ID
-    headers:
-      Accept: ['*/*']
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      Content-Length: ['235']
-      Content-Type: [application/x-www-form-urlencoded]
-      User-Agent: [python-requests/2.9.1]
-    method: POST
-    uri: http://localhost:3000/oauth/token
-  response:
-    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]
-      Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"c57fcf388c3eb63010fe039f12a02374"]
-      Pragma: [no-cache]
-      Transfer-Encoding: [chunked]
-      Vary: ['Accept-Encoding, Origin']
-      X-Request-Id: [1b84affa-2aa1-4d58-a45a-e53c07552d0e]
-      X-Runtime: ['0.198551']
-      content-length: ['126']
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      Accept: ['*/*']
-      Accept-Encoding: ['gzip, deflate']
-      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN_2]
-      Connection: [keep-alive]
-      User-Agent: [python-requests/2.9.1]
-    method: GET
-    uri: http://localhost:3000/api/v1/accounts/verify_credentials
-  response:
-    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-Type: [application/json; charset=utf-8]
-      ETag: [W/"0b553118eec8d82a63321efca0e359ef"]
-      Transfer-Encoding: [chunked]
-      Vary: ['Accept-Encoding, Origin']
-      X-Content-Type-Options: [nosniff]
-      X-Frame-Options: [SAMEORIGIN]
-      X-Request-Id: [aafd9996-aa86-44fc-8b26-49b450adbc36]
-      X-Runtime: ['0.040936']
+      X-Request-Id: [f578cb7f-06c2-41d3-bf87-3492db415475]
+      X-Runtime: ['0.037579']
       X-XSS-Protection: [1; mode=block]
       content-length: ['571']
     status: {code: 200, message: OK}