Test fixups and small 2.8 fixes

Pagination backwards is broken presently.

1 files changed, 22 insertions, 22 deletions

diff --git a/tests/cassettes/test_push_update.yaml b/tests/cassettes/test_push_update.yaml
index 7f6527b..5ba387d 100644
--- a/tests/cassettes/test_push_update.yaml
+++ b/tests/cassettes/test_push_update.yaml
@@ -1,22 +1,22 @@
 interactions:
 - request:
-    body: subscription%5Bendpoint%5D=https%3A%2F%2Fexample.com&subscription%5Bkeys%5D%5Bp256dh%5D=BNf5vOWrGdkIa%2B0ymfGGguAJJqG0vJgw%2FXYtQaQBAf67LUQj7wL61kqqR%2F4JTjXJFu%2FXBbp%2FudchIsmU556gb9Y%3D&subscription%5Bkeys%5D%5Bauth%5D=KYw%2BrnihQdlsaTlYIsFwXw%3D%3D&data%5Balerts%5D%5Bfollow%5D=False&data%5Balerts%5D%5Bfavourite%5D=False&data%5Balerts%5D%5Breblog%5D=False&data%5Balerts%5D%5Bmention%5D=False
+    body: subscription%5Bendpoint%5D=https%3A%2F%2Fexample.com&subscription%5Bkeys%5D%5Bp256dh%5D=BAouXva76kHOex7%2FtGQHEcfKF9B%2FSFszspUvSljPFTcwjm1NK6WZzLSTdqctwyHAkBD%2BZIUXEkF%2FlObYDU4UKho%3D&subscription%5Bkeys%5D%5Bauth%5D=38p8CsDi%2BiQINZLdx36rsw%3D%3D&data%5Balerts%5D%5Bfollow%5D=False&data%5Balerts%5D%5Bfavourite%5D=False&data%5Balerts%5D%5Breblog%5D=False&data%5Balerts%5D%5Bmention%5D=False
     headers:
       Accept: ['*/*']
       Accept-Encoding: ['gzip, deflate']
       Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
       Connection: [keep-alive]
-      Content-Length: ['396']
+      Content-Length: ['394']
       Content-Type: [application/x-www-form-urlencoded]
       User-Agent: [python-requests/2.18.4]
     method: POST
     uri: http://localhost:3000/api/v1/push/subscription
   response:
-    body: {string: '{"id":8,"endpoint":"https://example.com","alerts":{"follow":"False","favourite":"False","reblog":"False","mention":"False"},"server_key":"BFUzywftzA81kLihlpi_bTniTwxuGp_D2gX9CHRq4qJQJgsKQUFyc8juKZ-fHMR6YxnA1A1qhgVvMTChH21CMhY="}'}
+    body: {string: '{"id":8,"endpoint":"https://example.com","alerts":{"follow":"False","favourite":"False","reblog":"False","mention":"False"},"server_key":"BP3YHleCxMqxCT6NGjNfl8rRj9BVI9ZGr3xLNzK53Uf0AcMo2VUFgAtdwQBfGofTb48sImPX-LRHTZgmZACu8A0="}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"cb873fcf08406f258972bef68fe34f3e"]
+      ETag: [W/"a9f714714ecf13be238f8e14137ad705"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -24,8 +24,8 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [dc740d07-571d-40a7-850e-d62d16771f6b]
-      X-Runtime: ['0.037476']
+      X-Request-Id: [6689cc6f-dd12-47e3-9be8-8d324809756f]
+      X-Runtime: ['0.024519']
       X-XSS-Protection: [1; mode=block]
       content-length: ['228']
     status: {code: 200, message: OK}
@@ -42,11 +42,11 @@ interactions:
     method: PUT
     uri: http://localhost:3000/api/v1/push/subscription
   response:
-    body: {string: '{"id":8,"endpoint":"https://example.com","alerts":{"follow":"True","favourite":"True","reblog":"True","mention":"True"},"server_key":"BFUzywftzA81kLihlpi_bTniTwxuGp_D2gX9CHRq4qJQJgsKQUFyc8juKZ-fHMR6YxnA1A1qhgVvMTChH21CMhY="}'}
+    body: {string: '{"id":8,"endpoint":"https://example.com","alerts":{"follow":"True","favourite":"True","reblog":"True","mention":"True"},"server_key":"BP3YHleCxMqxCT6NGjNfl8rRj9BVI9ZGr3xLNzK53Uf0AcMo2VUFgAtdwQBfGofTb48sImPX-LRHTZgmZACu8A0="}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"3aa680a6852f654c4978e92abac3835b"]
+      ETag: [W/"5df558b00f6a5c9e0f94f4c8e4505b33"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -54,8 +54,8 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [9c0f65db-6c7d-4a33-8b36-7dcc2538d739]
-      X-Runtime: ['0.027803']
+      X-Request-Id: [2f636234-36ea-49e5-ab5c-7b2c0e0b1a6d]
+      X-Runtime: ['0.020232']
       X-XSS-Protection: [1; mode=block]
       content-length: ['224']
     status: {code: 200, message: OK}
@@ -70,11 +70,11 @@ interactions:
     method: GET
     uri: http://localhost:3000/api/v1/push/subscription
   response:
-    body: {string: '{"id":8,"endpoint":"https://example.com","alerts":{"follow":"True","favourite":"True","reblog":"True","mention":"True"},"server_key":"BFUzywftzA81kLihlpi_bTniTwxuGp_D2gX9CHRq4qJQJgsKQUFyc8juKZ-fHMR6YxnA1A1qhgVvMTChH21CMhY="}'}
+    body: {string: '{"id":8,"endpoint":"https://example.com","alerts":{"follow":"True","favourite":"True","reblog":"True","mention":"True"},"server_key":"BP3YHleCxMqxCT6NGjNfl8rRj9BVI9ZGr3xLNzK53Uf0AcMo2VUFgAtdwQBfGofTb48sImPX-LRHTZgmZACu8A0="}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"c634d8dcb9a3ad60e3dafc74cc311246"]
+      ETag: [W/"0d6e9bdc5b0f821bfffd98651bb53f5d"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -82,8 +82,8 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [bc57a4d9-d409-41ea-9a73-5831798fc911]
-      X-Runtime: ['0.040363']
+      X-Request-Id: [878a3b34-e985-4b71-994c-5302abd2e3ca]
+      X-Runtime: ['0.052652']
       X-XSS-Protection: [1; mode=block]
       content-length: ['224']
     status: {code: 200, message: OK}
@@ -100,11 +100,11 @@ interactions:
     method: PUT
     uri: http://localhost:3000/api/v1/push/subscription
   response:
-    body: {string: '{"id":8,"endpoint":"https://example.com","alerts":{"follow":"False","favourite":"False","reblog":"False","mention":"False"},"server_key":"BFUzywftzA81kLihlpi_bTniTwxuGp_D2gX9CHRq4qJQJgsKQUFyc8juKZ-fHMR6YxnA1A1qhgVvMTChH21CMhY="}'}
+    body: {string: '{"id":8,"endpoint":"https://example.com","alerts":{"follow":"False","favourite":"False","reblog":"False","mention":"False"},"server_key":"BP3YHleCxMqxCT6NGjNfl8rRj9BVI9ZGr3xLNzK53Uf0AcMo2VUFgAtdwQBfGofTb48sImPX-LRHTZgmZACu8A0="}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"20acfc2e3be503e3b91d0643fe1b99e4"]
+      ETag: [W/"58efea622787388ae99d1c4e21701d46"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -112,8 +112,8 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [77fdd51d-3d92-4512-88b4-8c71bf87e399]
-      X-Runtime: ['0.063999']
+      X-Request-Id: [7a27b5cc-f810-4ea6-ad96-fac6810f5747]
+      X-Runtime: ['0.026188']
       X-XSS-Protection: [1; mode=block]
       content-length: ['228']
     status: {code: 200, message: OK}
@@ -128,11 +128,11 @@ interactions:
     method: GET
     uri: http://localhost:3000/api/v1/push/subscription
   response:
-    body: {string: '{"id":8,"endpoint":"https://example.com","alerts":{"follow":"False","favourite":"False","reblog":"False","mention":"False"},"server_key":"BFUzywftzA81kLihlpi_bTniTwxuGp_D2gX9CHRq4qJQJgsKQUFyc8juKZ-fHMR6YxnA1A1qhgVvMTChH21CMhY="}'}
+    body: {string: '{"id":8,"endpoint":"https://example.com","alerts":{"follow":"False","favourite":"False","reblog":"False","mention":"False"},"server_key":"BP3YHleCxMqxCT6NGjNfl8rRj9BVI9ZGr3xLNzK53Uf0AcMo2VUFgAtdwQBfGofTb48sImPX-LRHTZgmZACu8A0="}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"c87557e258dc7ac7ab2aa5f083020884"]
+      ETag: [W/"7968a6fb2a6f4e3cb959f29ba1bd38d5"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -140,8 +140,8 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [fe7eb705-967f-40a8-9b76-416b6f2d8879]
-      X-Runtime: ['0.031638']
+      X-Request-Id: [9eeec92f-a9b0-427d-b266-affaaf8f7f98]
+      X-Runtime: ['0.035473']
       X-XSS-Protection: [1; mode=block]
       content-length: ['228']
     status: {code: 200, message: OK}