From 64ec9e20987072692227d8817d9fd99d497fea5e Mon Sep 17 00:00:00 2001 From: Lorenz Diener Date: Wed, 18 Apr 2018 22:00:35 +0200 Subject: Update the tests --- tests/cassettes/test_log_in_password_to_file.yaml | 54 +++++++++++------------ 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'tests/cassettes/test_log_in_password_to_file.yaml') 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 -- cgit v1.2.3 From bc7b9defe8b72b6ab14ade6828a98f4d6e82b1de Mon Sep 17 00:00:00 2001 From: Lorenz Diener Date: Wed, 18 Apr 2018 22:07:03 +0200 Subject: Attempt 2 at fixing the tests for travis --- tests/cassettes/test_log_in_password_to_file.yaml | 50 +++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'tests/cassettes/test_log_in_password_to_file.yaml') diff --git a/tests/cassettes/test_log_in_password_to_file.yaml b/tests/cassettes/test_log_in_password_to_file.yaml index 8b22fe5..f9c4f31 100644 --- a/tests/cassettes/test_log_in_password_to_file.yaml +++ b/tests/cassettes/test_log_in_password_to_file.yaml @@ -49,4 +49,54 @@ interactions: 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-XSS-Protection: [1; mode=block] + content-length: ['571'] + status: {code: 200, message: OK} version: 1 -- cgit v1.2.3 From a15d28d9d60128fd5551f05eccd8999b46f70f5e Mon Sep 17 00:00:00 2001 From: Lorenz Diener Date: Sun, 6 May 2018 01:37:13 +0200 Subject: Testing updates, can now test streaming API --- tests/cassettes/test_log_in_password_to_file.yaml | 66 +++-------------------- 1 file changed, 8 insertions(+), 58 deletions(-) (limited to 'tests/cassettes/test_log_in_password_to_file.yaml') 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} -- cgit v1.2.3 From bb92f76e61063bbe59868659fb42824d3649c7b2 Mon Sep 17 00:00:00 2001 From: Lorenz Diener Date: Sun, 6 May 2018 03:02:19 +0200 Subject: Refresh casettes and add some new ones --- tests/cassettes/test_log_in_password_to_file.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/cassettes/test_log_in_password_to_file.yaml') diff --git a/tests/cassettes/test_log_in_password_to_file.yaml b/tests/cassettes/test_log_in_password_to_file.yaml index 903f7cb..ab35ec2 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: 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 + body: scope=read+write+follow&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&client_id=__MASTODON_PY_TEST_CLIENT_ID&username=admin%40localhost%3A3000&grant_type=password&client_secret=__MASTODON_PY_TEST_CLIENT_SECRET&password=mastodonadmin 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/"3146bc67569d7c9f332f4bcd447a1d3f"] + ETag: [W/"031072f69dc3fe5d845162c8675818c9"] Pragma: [no-cache] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] - X-Request-Id: [63d67f55-d234-4bec-83be-15b5dd799313] - X-Runtime: ['0.128303'] + X-Request-Id: [dc21e55e-b68b-45c2-8280-a6d80289a498] + X-Runtime: ['0.172641'] content-length: ['126'] status: {code: 200, message: OK} - request: @@ -35,17 +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":38,"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":46,"source":{"privacy":"public","sensitive":false,"note":""}}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"4744ac665ec260e0cf2992419ea025df"] + ETag: [W/"dc9a04461cace4111f89956c2cb4c9c7"] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] X-Content-Type-Options: [nosniff] X-Frame-Options: [SAMEORIGIN] - X-Request-Id: [f578cb7f-06c2-41d3-bf87-3492db415475] - X-Runtime: ['0.037579'] + X-Request-Id: [99303357-745a-4f78-a082-9aaf17331699] + X-Runtime: ['0.045854'] X-XSS-Protection: [1; mode=block] content-length: ['571'] status: {code: 200, message: OK} -- cgit v1.2.3