Test fixups and small 2.8 fixes

Pagination backwards is broken presently.

1 files changed, 21 insertions, 18 deletions

diff --git a/tests/cassettes/test_verify_version.yaml b/tests/cassettes/test_verify_version.yaml
index 36f935c..7cd183e 100644
--- a/tests/cassettes/test_verify_version.yaml
+++ b/tests/cassettes/test_verify_version.yaml
@@ -10,11 +10,12 @@ interactions:
     method: GET
     uri: http://localhost:3000/api/v1/instance/
   response:
-    body: {string: '{"uri":"localhost:3000","title":"Mastodon","description":"","email":"","version":"2.4.3","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":2,"status_count":173,"domain_count":0},"thumbnail":"http://localhost:3000/packs/preview.jpg","languages":["en"],"contact_account":null}'}
+    body: {string: '{"uri":"localhost","title":"Mastodon","description":"","email":"","version":"2.8.0","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":2,"status_count":45,"domain_count":0},"thumbnail":"http://localhost/packs/media/images/preview-9a17d32fc48369e8ccd910a75260e67d.jpg","languages":["en"],"registrations":true,"contact_account":null}'}
     headers:
-      Cache-Control: ['max-age=0, private, must-revalidate']
+      Cache-Control: ['max-age=300, public']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"ce84d5b9a246cf18a8f733165a0d9ee5"]
+      Date: ['Sat, 27 Apr 2019 18:17:53 GMT']
+      ETag: [W/"98508d6117d3c1cc49e05e6813dab7f2"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -22,10 +23,10 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [d13debd8-f859-4044-ae20-935cafaca822]
-      X-Runtime: ['0.041463']
+      X-Request-Id: [724fc186-da26-4319-b572-6402246bab7e]
+      X-Runtime: ['0.031647']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['293']
+      content-length: ['349']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -38,11 +39,12 @@ interactions:
     method: GET
     uri: http://localhost:3000/api/v1/instance/
   response:
-    body: {string: '{"uri":"localhost:3000","title":"Mastodon","description":"","email":"","version":"2.4.3","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":2,"status_count":173,"domain_count":0},"thumbnail":"http://localhost:3000/packs/preview.jpg","languages":["en"],"contact_account":null}'}
+    body: {string: '{"uri":"localhost","title":"Mastodon","description":"","email":"","version":"2.8.0","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":2,"status_count":45,"domain_count":0},"thumbnail":"http://localhost/packs/media/images/preview-9a17d32fc48369e8ccd910a75260e67d.jpg","languages":["en"],"registrations":true,"contact_account":null}'}
     headers:
-      Cache-Control: ['max-age=0, private, must-revalidate']
+      Cache-Control: ['max-age=300, public']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"ce84d5b9a246cf18a8f733165a0d9ee5"]
+      Date: ['Sat, 27 Apr 2019 18:17:53 GMT']
+      ETag: [W/"98508d6117d3c1cc49e05e6813dab7f2"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -50,10 +52,10 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [77d90174-be17-4b91-9e3c-81400772119f]
-      X-Runtime: ['0.049465']
+      X-Request-Id: [f5698cfe-4b19-4736-9365-42041be4f21b]
+      X-Runtime: ['0.023511']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['293']
+      content-length: ['349']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -66,11 +68,12 @@ interactions:
     method: GET
     uri: http://localhost:3000/api/v1/instance/
   response:
-    body: {string: '{"uri":"localhost:3000","title":"Mastodon","description":"","email":"","version":"2.4.3","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":2,"status_count":173,"domain_count":0},"thumbnail":"http://localhost:3000/packs/preview.jpg","languages":["en"],"contact_account":null}'}
+    body: {string: '{"uri":"localhost","title":"Mastodon","description":"","email":"","version":"2.8.0","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":2,"status_count":45,"domain_count":0},"thumbnail":"http://localhost/packs/media/images/preview-9a17d32fc48369e8ccd910a75260e67d.jpg","languages":["en"],"registrations":true,"contact_account":null}'}
     headers:
-      Cache-Control: ['max-age=0, private, must-revalidate']
+      Cache-Control: ['max-age=300, public']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"ce84d5b9a246cf18a8f733165a0d9ee5"]
+      Date: ['Sat, 27 Apr 2019 18:17:53 GMT']
+      ETag: [W/"98508d6117d3c1cc49e05e6813dab7f2"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -78,9 +81,9 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [fb815b68-5afb-4f63-be56-b68667acca81]
-      X-Runtime: ['0.036197']
+      X-Request-Id: [aef56f08-95ca-450f-8afe-78a10ef34a94]
+      X-Runtime: ['0.023583']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['293']
+      content-length: ['349']
     status: {code: 200, message: OK}
 version: 1