Test fixups pre-2.9.1

1 files changed, 10 insertions, 12 deletions

diff --git a/tests/cassettes/test_push_set.yaml b/tests/cassettes/test_push_set.yaml
index 2745be3..1237d79 100644
--- a/tests/cassettes/test_push_set.yaml
+++ b/tests/cassettes/test_push_set.yaml
@@ -1,22 +1,21 @@
 interactions:
 - request:
-    body: subscription%5Bendpoint%5D=https%3A%2F%2Fexample.com&subscription%5Bkeys%5D%5Bp256dh%5D=BAsxK2FBgEOKFAhSnisWyHPeinU2nUJ7SqhZ8%2B03yZOpkSC9YuNT58%2B%2BHX7uMnQ6%2BOJPXKbYAKTveYjgSyntAMk%3D&subscription%5Bkeys%5D%5Bauth%5D=Ks75Jd05g1aHqG7mCDdZ%2BQ%3D%3D
+    body: subscription%5Bendpoint%5D=https%3A%2F%2Fexample.com&subscription%5Bkeys%5D%5Bp256dh%5D=BC8J%2BAOSp0qSf4liRHkw0mrx01QrIqDHjz5F6qc8NuiG6M03i4QGIeWm3IYhwvIqMkOO30bqGmkoewGU7BN1Fnc%3D&subscription%5Bkeys%5D%5Bauth%5D=C3U3NXZP%2Fei0KKRVU2anWw%3D%3D
     headers:
       Accept: ['*/*']
       Accept-Encoding: ['gzip, deflate']
       Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
       Connection: [keep-alive]
-      Content-Length: ['250']
+      Content-Length: ['244']
       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":7,"endpoint":"https://example.com","alerts":{},"server_key":"BP3YHleCxMqxCT6NGjNfl8rRj9BVI9ZGr3xLNzK53Uf0AcMo2VUFgAtdwQBfGofTb48sImPX-LRHTZgmZACu8A0="}'}
+    body: {string: '{"id":1,"endpoint":"https://example.com","alerts":{},"server_key":"BDoiaZnI8zQeheo5OzO3lDE5gn63dlzoaHrLTP7tctyKW-hj8yFIvIfWyCp8e-dT8kpJd9Ru7Sd-TTO2DXYgvwI="}'}
     headers:
-      Cache-Control: ['max-age=0, private, must-revalidate']
+      Cache-Control: ['no-cache, no-store']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"30a0afc7d55cb1d4863b67d20c8b93d6"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -24,8 +23,8 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [a239b437-9f21-41b2-88e7-2d43de580991]
-      X-Runtime: ['0.067181']
+      X-Request-Id: [14d88eb8-c6e3-42d9-954d-35a3b28c47f4]
+      X-Runtime: ['0.044297']
       X-XSS-Protection: [1; mode=block]
       content-length: ['157']
     status: {code: 200, message: OK}
@@ -40,11 +39,10 @@ interactions:
     method: GET
     uri: http://localhost:3000/api/v1/push/subscription
   response:
-    body: {string: '{"id":7,"endpoint":"https://example.com","alerts":{},"server_key":"BP3YHleCxMqxCT6NGjNfl8rRj9BVI9ZGr3xLNzK53Uf0AcMo2VUFgAtdwQBfGofTb48sImPX-LRHTZgmZACu8A0="}'}
+    body: {string: '{"id":1,"endpoint":"https://example.com","alerts":{},"server_key":"BDoiaZnI8zQeheo5OzO3lDE5gn63dlzoaHrLTP7tctyKW-hj8yFIvIfWyCp8e-dT8kpJd9Ru7Sd-TTO2DXYgvwI="}'}
     headers:
-      Cache-Control: ['max-age=0, private, must-revalidate']
+      Cache-Control: ['no-cache, no-store']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"30a0afc7d55cb1d4863b67d20c8b93d6"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -52,8 +50,8 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [e0a552f1-4ff9-4ab3-b1f5-c5e226965714]
-      X-Runtime: ['0.015818']
+      X-Request-Id: [dc0af102-227e-4701-80d5-0939633bad49]
+      X-Runtime: ['0.017843']
       X-XSS-Protection: [1; mode=block]
       content-length: ['157']
     status: {code: 200, message: OK}