From 864328e074d771a9b50fb1b01392541d7045fbb5 Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Mon, 4 Jun 2018 20:53:12 -0700
Subject: [PATCH] Test client wrapper removing need for gather_request - refs
 #272

As part of decoupling from Sanic, this will make it easier to run tests
against ASGI instead.
---
 tests/fixtures.py     |  14 +++-
 tests/test_api.py     | 146 ++++++++++++++++--------------------------
 tests/test_html.py    |  91 ++++++++++++--------------
 tests/test_plugins.py |  10 ++-
 4 files changed, 114 insertions(+), 147 deletions(-)

diff --git a/tests/fixtures.py b/tests/fixtures.py
index 3c2d9402..17d6745b 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -10,6 +10,18 @@ import tempfile
 import time
 
 
+class TestClient:
+    def __init__(self, sanic_test_client):
+        self.sanic_test_client = sanic_test_client
+
+    def get(self, path, allow_redirects=True):
+        return self.sanic_test_client.get(
+            path,
+            allow_redirects=allow_redirects,
+            gather_request=False
+        )
+
+
 @pytest.fixture(scope='session')
 def app_client(sql_time_limit_ms=None, max_returned_rows=None, config=None):
     with tempfile.TemporaryDirectory() as tmpdir:
@@ -36,7 +48,7 @@ def app_client(sql_time_limit_ms=None, max_returned_rows=None, config=None):
         ds.sqlite_functions.append(
             ('sleep', 1, lambda n: time.sleep(float(n))),
         )
-        client = ds.app().test_client
+        client = TestClient(ds.app().test_client)
         client.ds = ds
         yield client
 
diff --git a/tests/test_api.py b/tests/test_api.py
index f2378005..221cb0ca 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -12,7 +12,7 @@ import urllib
 
 
 def test_homepage(app_client):
-    _, response = app_client.get('/.json')
+    response = app_client.get('/.json')
     assert response.status == 200
     assert response.json.keys() == {'test_tables': 0}.keys()
     d = response.json['test_tables']
@@ -21,7 +21,7 @@ def test_homepage(app_client):
 
 
 def test_database_page(app_client):
-    response = app_client.get('/test_tables.json', gather_request=False)
+    response = app_client.get('/test_tables.json')
     data = response.json
     assert 'test_tables' == data['database']
     assert [{
@@ -313,8 +313,7 @@ def test_database_page(app_client):
 
 def test_custom_sql(app_client):
     response = app_client.get(
-        '/test_tables.json?sql=select+content+from+simple_primary_key&_shape=objects',
-        gather_request=False
+        '/test_tables.json?sql=select+content+from+simple_primary_key&_shape=objects'
     )
     data = response.json
     assert {
@@ -333,8 +332,7 @@ def test_custom_sql(app_client):
 
 def test_sql_time_limit(app_client_shorter_time_limit):
     response = app_client_shorter_time_limit.get(
-        '/test_tables.json?sql=select+sleep(0.5)',
-        gather_request=False
+        '/test_tables.json?sql=select+sleep(0.5)'
     )
     assert 400 == response.status
     assert 'SQL Interrupted' == response.json['title']
@@ -342,13 +340,11 @@ def test_sql_time_limit(app_client_shorter_time_limit):
 
 def test_custom_sql_time_limit(app_client):
     response = app_client.get(
-        '/test_tables.json?sql=select+sleep(0.01)',
-        gather_request=False
+        '/test_tables.json?sql=select+sleep(0.01)'
     )
     assert 200 == response.status
     response = app_client.get(
-        '/test_tables.json?sql=select+sleep(0.01)&_timelimit=5',
-        gather_request=False
+        '/test_tables.json?sql=select+sleep(0.01)&_timelimit=5'
     )
     assert 400 == response.status
     assert 'SQL Interrupted' == response.json['title']
@@ -356,8 +352,7 @@ def test_custom_sql_time_limit(app_client):
 
 def test_invalid_custom_sql(app_client):
     response = app_client.get(
-        '/test_tables.json?sql=.schema',
-        gather_request=False
+        '/test_tables.json?sql=.schema'
     )
     assert response.status == 400
     assert response.json['ok'] is False
@@ -369,13 +364,12 @@ def test_allow_sql_off():
         'allow_sql': False,
     }):
         assert 400 == client.get(
-            "/test_tables.json?sql=select+sleep(0.01)",
-            gather_request=False
+            "/test_tables.json?sql=select+sleep(0.01)"
         ).status
 
 
 def test_table_json(app_client):
-    response = app_client.get('/test_tables/simple_primary_key.json?_shape=objects', gather_request=False)
+    response = app_client.get('/test_tables/simple_primary_key.json?_shape=objects')
     assert response.status == 200
     data = response.json
     assert data['query']['sql'] == 'select * from simple_primary_key order by id limit 51'
@@ -398,21 +392,17 @@ def test_table_not_exists_json(app_client):
         'error': 'Table not found: blah',
         'status': 404,
         'title': None,
-    } == app_client.get(
-        '/test_tables/blah.json', gather_request=False
-    ).json
+    } == app_client.get('/test_tables/blah.json').json
 
 
 def test_jsono_redirects_to_shape_objects(app_client):
     response_1 = app_client.get(
         '/test_tables/simple_primary_key.jsono',
-        allow_redirects=False,
-        gather_request=False
+        allow_redirects=False
     )
     response = app_client.get(
         response_1.headers['Location'],
-        allow_redirects=False,
-        gather_request=False
+        allow_redirects=False
     )
     assert response.status == 302
     assert response.headers['Location'].endswith('?_shape=objects')
@@ -420,8 +410,7 @@ def test_jsono_redirects_to_shape_objects(app_client):
 
 def test_table_shape_arrays(app_client):
     response = app_client.get(
-        '/test_tables/simple_primary_key.json?_shape=arrays',
-        gather_request=False
+        '/test_tables/simple_primary_key.json?_shape=arrays'
     )
     assert [
         ['1', 'hello'],
@@ -435,16 +424,14 @@ def test_table_shape_arrayfirst(app_client):
         '/test_tables.json?' + urllib.parse.urlencode({
             'sql': 'select content from simple_primary_key order by id',
             '_shape': 'arrayfirst'
-        }),
-        gather_request=False
+        })
     )
     assert ['hello', 'world', ''] == response.json
 
 
 def test_table_shape_objects(app_client):
     response = app_client.get(
-        '/test_tables/simple_primary_key.json?_shape=objects',
-        gather_request=False
+        '/test_tables/simple_primary_key.json?_shape=objects'
     )
     assert [{
         'id': '1',
@@ -460,8 +447,7 @@ def test_table_shape_objects(app_client):
 
 def test_table_shape_array(app_client):
     response = app_client.get(
-        '/test_tables/simple_primary_key.json?_shape=array',
-        gather_request=False
+        '/test_tables/simple_primary_key.json?_shape=array'
     )
     assert [{
         'id': '1',
@@ -477,8 +463,7 @@ def test_table_shape_array(app_client):
 
 def test_table_shape_invalid(app_client):
     response = app_client.get(
-        '/test_tables/simple_primary_key.json?_shape=invalid',
-        gather_request=False
+        '/test_tables/simple_primary_key.json?_shape=invalid'
     )
     assert {
         'ok': False,
@@ -490,8 +475,7 @@ def test_table_shape_invalid(app_client):
 
 def test_table_shape_object(app_client):
     response = app_client.get(
-        '/test_tables/simple_primary_key.json?_shape=object',
-        gather_request=False
+        '/test_tables/simple_primary_key.json?_shape=object'
     )
     assert {
         '1': {
@@ -511,8 +495,7 @@ def test_table_shape_object(app_client):
 
 def test_table_shape_object_compound_primary_Key(app_client):
     response = app_client.get(
-        '/test_tables/compound_primary_key.json?_shape=object',
-        gather_request=False
+        '/test_tables/compound_primary_key.json?_shape=object'
     )
     assert {
         'a,b': {
@@ -524,7 +507,7 @@ def test_table_shape_object_compound_primary_Key(app_client):
 
 
 def test_table_with_slashes_in_name(app_client):
-    response = app_client.get('/test_tables/table%2Fwith%2Fslashes.csv.json?_shape=objects', gather_request=False)
+    response = app_client.get('/test_tables/table%2Fwith%2Fslashes.csv.json?_shape=objects')
     assert response.status == 200
     data = response.json
     assert data['rows'] == [{
@@ -534,7 +517,7 @@ def test_table_with_slashes_in_name(app_client):
 
 
 def test_table_with_reserved_word_name(app_client):
-    response = app_client.get('/test_tables/select.json?_shape=objects', gather_request=False)
+    response = app_client.get('/test_tables/select.json?_shape=objects')
     assert response.status == 200
     data = response.json
     assert data['rows'] == [{
@@ -559,7 +542,7 @@ def test_paginate_tables_and_views(app_client, path, expected_rows, expected_pag
     fetched = []
     count = 0
     while path:
-        response = app_client.get(path, gather_request=False)
+        response = app_client.get(path)
         assert 200 == response.status
         count += 1
         fetched.extend(response.json['rows'])
@@ -581,14 +564,14 @@ def test_paginate_tables_and_views(app_client, path, expected_rows, expected_pag
     ('/test_tables/no_primary_key.json?_size=1001', '_size must be <= 100'),
 ])
 def test_validate_page_size(app_client, path, expected_error):
-    response = app_client.get(path, gather_request=False)
+    response = app_client.get(path)
     assert expected_error == response.json['error']
     assert 400 == response.status
 
 
 def test_page_size_zero(app_client):
     "For _size=0 we return the counts, empty rows and no continuation token"
-    response = app_client.get('/test_tables/no_primary_key.json?_size=0', gather_request=False)
+    response = app_client.get('/test_tables/no_primary_key.json?_size=0')
     assert 200 == response.status
     assert [] == response.json['rows']
     assert 201 == response.json['table_rows_count']
@@ -603,7 +586,7 @@ def test_paginate_compound_keys(app_client):
     page = 0
     while path:
         page += 1
-        response = app_client.get(path, gather_request=False)
+        response = app_client.get(path)
         fetched.extend(response.json['rows'])
         path = response.json['next_url']
         assert page < 100
@@ -622,7 +605,7 @@ def test_paginate_compound_keys_with_extra_filters(app_client):
     while path:
         page += 1
         assert page < 100
-        response = app_client.get(path, gather_request=False)
+        response = app_client.get(path)
         fetched.extend(response.json['rows'])
         path = response.json['next_url']
     assert 2 == page
@@ -663,7 +646,7 @@ def test_sortable(app_client, query_string, sort_key, human_description_en):
     while path:
         page += 1
         assert page < 100
-        response = app_client.get(path, gather_request=False)
+        response = app_client.get(path)
         assert human_description_en == response.json['human_description_en']
         fetched.extend(response.json['rows'])
         path = response.json['next_url']
@@ -682,7 +665,7 @@ def test_sortable_and_filtered(app_client):
         '/test_tables/sortable.json'
         '?content__contains=d&_sort_desc=sortable&_shape=objects'
     )
-    response = app_client.get(path, gather_request=False)
+    response = app_client.get(path)
     fetched = response.json['rows']
     assert 'where content contains "d" sorted by sortable descending' \
         == response.json['human_description_en']
@@ -702,33 +685,28 @@ def test_sortable_and_filtered(app_client):
 
 def test_sortable_argument_errors(app_client):
     response = app_client.get(
-        '/test_tables/sortable.json?_sort=badcolumn',
-        gather_request=False
+        '/test_tables/sortable.json?_sort=badcolumn'
     )
     assert 'Cannot sort table by badcolumn' == response.json['error']
     response = app_client.get(
-        '/test_tables/sortable.json?_sort_desc=badcolumn2',
-        gather_request=False
+        '/test_tables/sortable.json?_sort_desc=badcolumn2'
     )
     assert 'Cannot sort table by badcolumn2' == response.json['error']
     response = app_client.get(
-        '/test_tables/sortable.json?_sort=sortable_with_nulls&_sort_desc=sortable',
-        gather_request=False
+        '/test_tables/sortable.json?_sort=sortable_with_nulls&_sort_desc=sortable'
     )
     assert 'Cannot use _sort and _sort_desc at the same time' == response.json['error']
 
 
 def test_sortable_columns_metadata(app_client):
     response = app_client.get(
-        '/test_tables/sortable.json?_sort=content',
-        gather_request=False
+        '/test_tables/sortable.json?_sort=content'
     )
     assert 'Cannot sort table by content' == response.json['error']
     # no_primary_key has ALL sort options disabled
     for column in ('content', 'a', 'b', 'c'):
         response = app_client.get(
-            '/test_tables/sortable.json?_sort={}'.format(column),
-            gather_request=False
+            '/test_tables/sortable.json?_sort={}'.format(column)
         )
         assert 'Cannot sort table by {}'.format(column) == response.json['error']
 
@@ -749,14 +727,13 @@ def test_sortable_columns_metadata(app_client):
     ]),
 ])
 def test_searchable(app_client, path, expected_rows):
-    response = app_client.get(path, gather_request=False)
+    response = app_client.get(path)
     assert expected_rows == response.json['rows']
 
 
 def test_searchable_invalid_column(app_client):
     response = app_client.get(
-        '/test_tables/searchable.json?_search_invalid=x',
-        gather_request=False
+        '/test_tables/searchable.json?_search_invalid=x'
     )
     assert 400 == response.status
     assert {
@@ -784,14 +761,13 @@ def test_searchable_invalid_column(app_client):
     ]),
 ])
 def test_table_filter_queries(app_client, path, expected_rows):
-    response = app_client.get(path, gather_request=False)
+    response = app_client.get(path)
     assert expected_rows == response.json['rows']
 
 
 def test_max_returned_rows(app_client):
     response = app_client.get(
-        '/test_tables.json?sql=select+content+from+no_primary_key',
-        gather_request=False
+        '/test_tables.json?sql=select+content+from+no_primary_key'
     )
     data = response.json
     assert {
@@ -803,7 +779,7 @@ def test_max_returned_rows(app_client):
 
 
 def test_view(app_client):
-    response = app_client.get('/test_tables/simple_view.json?_shape=objects', gather_request=False)
+    response = app_client.get('/test_tables/simple_view.json?_shape=objects')
     assert response.status == 200
     data = response.json
     assert data['rows'] == [{
@@ -819,13 +795,13 @@ def test_view(app_client):
 
 
 def test_row(app_client):
-    response = app_client.get('/test_tables/simple_primary_key/1.json?_shape=objects', gather_request=False)
+    response = app_client.get('/test_tables/simple_primary_key/1.json?_shape=objects')
     assert response.status == 200
     assert [{'id': '1', 'content': 'hello'}] == response.json['rows']
 
 
 def test_row_foreign_key_tables(app_client):
-    response = app_client.get('/test_tables/simple_primary_key/1.json?_extras=foreign_key_tables', gather_request=False)
+    response = app_client.get('/test_tables/simple_primary_key/1.json?_extras=foreign_key_tables')
     assert response.status == 200
     assert [{
         'column': 'id',
@@ -852,8 +828,7 @@ def test_row_foreign_key_tables(app_client):
 
 def test_unit_filters(app_client):
     response = app_client.get(
-        '/test_tables/units.json?distance__lt=75km&frequency__gt=1kHz',
-        gather_request=False
+        '/test_tables/units.json?distance__lt=75km&frequency__gt=1kHz'
     )
     assert response.status == 200
     data = response.json
@@ -867,24 +842,21 @@ def test_unit_filters(app_client):
 
 def test_metadata_json(app_client):
     response = app_client.get(
-        "/-/metadata.json",
-        gather_request=False
+        "/-/metadata.json"
     )
     assert METADATA == response.json
 
 
 def test_inspect_json(app_client):
     response = app_client.get(
-        "/-/inspect.json",
-        gather_request=False
+        "/-/inspect.json"
     )
     assert app_client.ds.inspect() == response.json
 
 
 def test_plugins_json(app_client):
     response = app_client.get(
-        "/-/plugins.json",
-        gather_request=False
+        "/-/plugins.json"
     )
     # This will include any plugins that have been installed into the
     # current virtual environment, so we only check for the presence of
@@ -899,8 +871,7 @@ def test_plugins_json(app_client):
 
 def test_versions_json(app_client):
     response = app_client.get(
-        "/-/versions.json",
-        gather_request=False
+        "/-/versions.json"
     )
     assert 'python' in response.json
     assert 'version' in response.json['python']
@@ -914,8 +885,7 @@ def test_versions_json(app_client):
 
 def test_config_json(app_client):
     response = app_client.get(
-        "/-/config.json",
-        gather_request=False
+        "/-/config.json"
     )
     assert {
         "default_page_size": 50,
@@ -938,9 +908,7 @@ def test_page_size_matching_max_returned_rows(app_client_returned_rows_matches_p
     fetched = []
     path = '/test_tables/no_primary_key.json'
     while path:
-        response = app_client_returned_rows_matches_page_size.get(
-            path, gather_request=False
-        )
+        response = app_client_returned_rows_matches_page_size.get(path)
         fetched.extend(response.json['rows'])
         assert len(response.json['rows']) in (1, 50)
         path = response.json['next_url']
@@ -1088,7 +1056,7 @@ def test_page_size_matching_max_returned_rows(app_client_returned_rows_matches_p
     )
 ])
 def test_facets(app_client, path, expected_facet_results):
-    response = app_client.get(path, gather_request=False)
+    response = app_client.get(path)
     facet_results = response.json['facet_results']
     # We only compare the querystring portion of the taggle_url
     for facet_name, facet_info in facet_results.items():
@@ -1101,8 +1069,7 @@ def test_facets(app_client, path, expected_facet_results):
 
 def test_suggested_facets(app_client):
     assert len(app_client.get(
-        "/test_tables/facetable.json",
-        gather_request=False
+        "/test_tables/facetable.json"
     ).json["suggested_facets"]) > 0
 
 
@@ -1111,13 +1078,11 @@ def test_allow_facet_off():
         'allow_facet': False,
     }):
         assert 400 == client.get(
-            "/test_tables/facetable.json?_facet=planet_int",
-            gather_request=False
+            "/test_tables/facetable.json?_facet=planet_int"
         ).status
         # Should not suggest any facets either:
         assert [] == client.get(
-            "/test_tables/facetable.json",
-            gather_request=False
+            "/test_tables/facetable.json"
         ).json["suggested_facets"]
 
 
@@ -1127,8 +1092,7 @@ def test_suggest_facets_off():
     }):
         # Now suggested_facets should be []
         assert [] == client.get(
-            "/test_tables/facetable.json",
-            gather_request=False
+            "/test_tables/facetable.json"
         ).json["suggested_facets"]
 
 
@@ -1139,7 +1103,7 @@ def test_suggest_facets_off():
     ("/test_tables/facetable.json?_ttl=0", "no-cache"),
 ])
 def test_ttl_parameter(app_client, path, expected_cache_control):
-    response = app_client.get(path, gather_request=False)
+    response = app_client.get(path)
     assert expected_cache_control == response.headers['Cache-Control']
 
 
@@ -1175,12 +1139,12 @@ def test_json_columns(app_client, extra_args, expected):
         "_shape": "array"
     })
     path += extra_args
-    response = app_client.get(path, gather_request=False)
+    response = app_client.get(path)
     assert expected == response.json
 
 
 def test_config_cache_size(app_client_larger_cache_size):
     response = app_client_larger_cache_size.get(
-        '/test_tables/pragma_cache_size.json', gather_request=False
+        '/test_tables/pragma_cache_size.json'
     )
     assert [[-2500]] == response.json['rows']
diff --git a/tests/test_html.py b/tests/test_html.py
index 80041faa..116945e1 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -9,22 +9,21 @@ import urllib.parse
 
 
 def test_homepage(app_client):
-    response = app_client.get('/', gather_request=False)
+    response = app_client.get('/')
     assert response.status == 200
     assert 'test_tables' in response.text
 
 
 def test_database_page(app_client):
-    response = app_client.get('/test_tables', allow_redirects=False, gather_request=False)
+    response = app_client.get('/test_tables', allow_redirects=False)
     assert response.status == 302
-    response = app_client.get('/test_tables', gather_request=False)
+    response = app_client.get('/test_tables')
     assert 'test_tables' in response.text
 
 
 def test_invalid_custom_sql(app_client):
     response = app_client.get(
-        '/test_tables?sql=.schema',
-        gather_request=False
+        '/test_tables?sql=.schema'
     )
     assert response.status == 400
     assert 'Statement must be a SELECT' in response.text
@@ -32,8 +31,7 @@ def test_invalid_custom_sql(app_client):
 
 def test_sql_time_limit(app_client_shorter_time_limit):
     response = app_client_shorter_time_limit.get(
-        '/test_tables?sql=select+sleep(0.5)',
-        gather_request=False
+        '/test_tables?sql=select+sleep(0.5)'
     )
     assert 400 == response.status
     expected_html_fragment = """
@@ -43,19 +41,18 @@ def test_sql_time_limit(app_client_shorter_time_limit):
 
 
 def test_view(app_client):
-    response = app_client.get('/test_tables/simple_view', gather_request=False)
+    response = app_client.get('/test_tables/simple_view')
     assert response.status == 200
 
 
 def test_row(app_client):
     response = app_client.get(
         '/test_tables/simple_primary_key/1',
-        allow_redirects=False,
-        gather_request=False
+        allow_redirects=False
     )
     assert response.status == 302
     assert response.headers['Location'].endswith('/1')
-    response = app_client.get('/test_tables/simple_primary_key/1', gather_request=False)
+    response = app_client.get('/test_tables/simple_primary_key/1')
     assert response.status == 200
 
 
@@ -67,16 +64,16 @@ def test_add_filter_redirects(app_client):
     })
     # First we need to resolve the correct path before testing more redirects
     path_base = app_client.get(
-        '/test_tables/simple_primary_key', allow_redirects=False, gather_request=False
+        '/test_tables/simple_primary_key', allow_redirects=False
     ).headers['Location']
     path = path_base + '?' + filter_args
-    response = app_client.get(path, allow_redirects=False, gather_request=False)
+    response = app_client.get(path, allow_redirects=False)
     assert response.status == 302
     assert response.headers['Location'].endswith('?content__startswith=x')
 
     # Adding a redirect to an existing querystring:
     path = path_base + '?foo=bar&' + filter_args
-    response = app_client.get(path, allow_redirects=False, gather_request=False)
+    response = app_client.get(path, allow_redirects=False)
     assert response.status == 302
     assert response.headers['Location'].endswith('?foo=bar&content__startswith=x')
 
@@ -86,7 +83,7 @@ def test_add_filter_redirects(app_client):
         '_filter_op': 'isnull__5',
         '_filter_value': 'x'
     })
-    response = app_client.get(path, allow_redirects=False, gather_request=False)
+    response = app_client.get(path, allow_redirects=False)
     assert response.status == 302
     assert response.headers['Location'].endswith('?content__isnull=5')
 
@@ -107,10 +104,10 @@ def test_existing_filter_redirects(app_client):
         '_filter_value_4': 'world',
     }
     path_base = app_client.get(
-        '/test_tables/simple_primary_key', allow_redirects=False, gather_request=False
+        '/test_tables/simple_primary_key', allow_redirects=False
     ).headers['Location']
     path = path_base + '?' + urllib.parse.urlencode(filter_args)
-    response = app_client.get(path, allow_redirects=False, gather_request=False)
+    response = app_client.get(path, allow_redirects=False)
     assert response.status == 302
     assert_querystring_equal(
         'name__contains=hello&age__gte=22&age__lt=30&name__contains=world',
@@ -120,7 +117,7 @@ def test_existing_filter_redirects(app_client):
     # Setting _filter_column_3 to empty string should remove *_3 entirely
     filter_args['_filter_column_3'] = ''
     path = path_base + '?' + urllib.parse.urlencode(filter_args)
-    response = app_client.get(path, allow_redirects=False, gather_request=False)
+    response = app_client.get(path, allow_redirects=False)
     assert response.status == 302
     assert_querystring_equal(
         'name__contains=hello&age__gte=22&name__contains=world',
@@ -128,14 +125,14 @@ def test_existing_filter_redirects(app_client):
     )
 
     # ?_filter_op=exact should be removed if unaccompanied by _fiter_column
-    response = app_client.get(path_base + '?_filter_op=exact', allow_redirects=False, gather_request=False)
+    response = app_client.get(path_base + '?_filter_op=exact', allow_redirects=False)
     assert response.status == 302
     assert '?' not in response.headers['Location']
 
 
 def test_empty_search_parameter_gets_removed(app_client):
     path_base = app_client.get(
-        '/test_tables/simple_primary_key', allow_redirects=False, gather_request=False
+        '/test_tables/simple_primary_key', allow_redirects=False
     ).headers['Location']
     path = path_base + '?' + urllib.parse.urlencode({
         '_search': '',
@@ -143,7 +140,7 @@ def test_empty_search_parameter_gets_removed(app_client):
         '_filter_op': 'exact',
         '_filter_value': 'chidi',
     })
-    response = app_client.get(path, allow_redirects=False, gather_request=False)
+    response = app_client.get(path, allow_redirects=False)
     assert response.status == 302
     assert response.headers['Location'].endswith(
         '?name__exact=chidi'
@@ -152,21 +149,21 @@ def test_empty_search_parameter_gets_removed(app_client):
 
 def test_sort_by_desc_redirects(app_client):
     path_base = app_client.get(
-        '/test_tables/sortable', allow_redirects=False, gather_request=False
+        '/test_tables/sortable', allow_redirects=False
     ).headers['Location']
     path = path_base + '?' + urllib.parse.urlencode({
         '_sort': 'sortable',
         '_sort_by_desc': '1',
     })
-    response = app_client.get(path, allow_redirects=False, gather_request=False)
+    response = app_client.get(path, allow_redirects=False)
     assert response.status == 302
     assert response.headers['Location'].endswith('?_sort_desc=sortable')
 
 
 def test_sort_links(app_client):
     response = app_client.get(
-        '/test_tables/sortable?_sort=sortable',
-        gather_request=False
+        '/test_tables/sortable?_sort=sortable'
+
     )
     assert response.status == 200
     ths = Soup(response.body, 'html.parser').findAll('th')
@@ -216,8 +213,7 @@ def test_sort_links(app_client):
 
 def test_facets_persist_through_filter_form(app_client):
     response = app_client.get(
-        '/test_tables/facetable?_facet=planet_int&_facet=city_id',
-        gather_request=False
+        '/test_tables/facetable?_facet=planet_int&_facet=city_id'
     )
     assert response.status == 200
     inputs = Soup(response.body, 'html.parser').find('form').findAll('input')
@@ -244,14 +240,14 @@ def test_facets_persist_through_filter_form(app_client):
     ]),
 ])
 def test_css_classes_on_body(app_client, path, expected_classes):
-    response = app_client.get(path, gather_request=False)
+    response = app_client.get(path)
     assert response.status == 200
     classes = re.search(r'<body class="(.*)">', response.text).group(1).split()
     assert classes == expected_classes
 
 
 def test_table_html_simple_primary_key(app_client):
-    response = app_client.get('/test_tables/simple_primary_key', gather_request=False)
+    response = app_client.get('/test_tables/simple_primary_key')
     assert response.status == 200
     table = Soup(response.body, 'html.parser').find('table')
     assert table['class'] == ['rows-and-columns']
@@ -279,7 +275,7 @@ def test_table_html_simple_primary_key(app_client):
 
 
 def test_row_html_simple_primary_key(app_client):
-    response = app_client.get('/test_tables/simple_primary_key/1', gather_request=False)
+    response = app_client.get('/test_tables/simple_primary_key/1')
     assert response.status == 200
     table = Soup(response.body, 'html.parser').find('table')
     assert [
@@ -295,12 +291,12 @@ def test_row_html_simple_primary_key(app_client):
 
 def test_table_not_exists(app_client):
     assert 'Table not found: blah' in app_client.get(
-        '/test_tables/blah', gather_request=False
+        '/test_tables/blah'
     ).body.decode('utf8')
 
 
 def test_table_html_no_primary_key(app_client):
-    response = app_client.get('/test_tables/no_primary_key', gather_request=False)
+    response = app_client.get('/test_tables/no_primary_key')
     assert response.status == 200
     table = Soup(response.body, 'html.parser').find('table')
     # We have disabled sorting for this table using metadata.json
@@ -321,7 +317,7 @@ def test_table_html_no_primary_key(app_client):
 
 
 def test_row_html_no_primary_key(app_client):
-    response = app_client.get('/test_tables/no_primary_key/1', gather_request=False)
+    response = app_client.get('/test_tables/no_primary_key/1')
     assert response.status == 200
     table = Soup(response.body, 'html.parser').find('table')
     assert [
@@ -340,7 +336,7 @@ def test_row_html_no_primary_key(app_client):
 
 
 def test_table_html_compound_primary_key(app_client):
-    response = app_client.get('/test_tables/compound_primary_key', gather_request=False)
+    response = app_client.get('/test_tables/compound_primary_key')
     assert response.status == 200
     table = Soup(response.body, 'html.parser').find('table')
     ths = table.findAll('th')
@@ -364,7 +360,7 @@ def test_table_html_compound_primary_key(app_client):
 
 
 def test_table_html_foreign_key_links(app_client):
-    response = app_client.get('/test_tables/foreign_key_references', gather_request=False)
+    response = app_client.get('/test_tables/foreign_key_references')
     assert response.status == 200
     table = Soup(response.body, 'html.parser').find('table')
     expected = [
@@ -378,7 +374,7 @@ def test_table_html_foreign_key_links(app_client):
 
 
 def test_table_html_foreign_key_custom_label_column(app_client):
-    response = app_client.get('/test_tables/custom_foreign_key_label', gather_request=False)
+    response = app_client.get('/test_tables/custom_foreign_key_label')
     assert response.status == 200
     table = Soup(response.body, 'html.parser').find('table')
     expected = [
@@ -391,7 +387,7 @@ def test_table_html_foreign_key_custom_label_column(app_client):
 
 
 def test_row_html_compound_primary_key(app_client):
-    response = app_client.get('/test_tables/compound_primary_key/a,b', gather_request=False)
+    response = app_client.get('/test_tables/compound_primary_key/a,b')
     assert response.status == 200
     table = Soup(response.body, 'html.parser').find('table')
     assert [
@@ -408,7 +404,7 @@ def test_row_html_compound_primary_key(app_client):
 
 
 def test_view_html(app_client):
-    response = app_client.get('/test_tables/simple_view', gather_request=False)
+    response = app_client.get('/test_tables/simple_view')
     assert response.status == 200
     table = Soup(response.body, 'html.parser').find('table')
     assert [
@@ -430,7 +426,7 @@ def test_view_html(app_client):
 
 
 def test_index_metadata(app_client):
-    response = app_client.get('/', gather_request=False)
+    response = app_client.get('/')
     assert response.status == 200
     soup = Soup(response.body, 'html.parser')
     assert 'Datasette Title' == soup.find('h1').text
@@ -441,7 +437,7 @@ def test_index_metadata(app_client):
 
 
 def test_database_metadata(app_client):
-    response = app_client.get('/test_tables', gather_request=False)
+    response = app_client.get('/test_tables')
     assert response.status == 200
     soup = Soup(response.body, 'html.parser')
     # Page title should be the default
@@ -455,7 +451,7 @@ def test_database_metadata(app_client):
 
 
 def test_table_metadata(app_client):
-    response = app_client.get('/test_tables/simple_primary_key', gather_request=False)
+    response = app_client.get('/test_tables/simple_primary_key')
     assert response.status == 200
     soup = Soup(response.body, 'html.parser')
     # Page title should be custom and should be HTML escaped
@@ -470,8 +466,7 @@ def test_table_metadata(app_client):
 
 def test_allow_download_on(app_client):
     response = app_client.get(
-        "/test_tables",
-        gather_request=False
+        "/test_tables"
     )
     soup = Soup(response.body, 'html.parser')
     assert len(soup.findAll('a', {'href': re.compile('\.db$')}))
@@ -483,22 +478,21 @@ def test_allow_download_off():
     }):
         response = client.get(
             "/test_tables",
-            gather_request=False
+
         )
         soup = Soup(response.body, 'html.parser')
         assert not len(soup.findAll('a', {'href': re.compile('\.db$')}))
         # Accessing URL directly should 403
         response = client.get(
             "/test_tables.db",
-            gather_request=False
+
         )
         assert 403 == response.status
 
 
 def test_allow_sql_on(app_client):
     response = app_client.get(
-        "/test_tables",
-        gather_request=False
+        "/test_tables"
     )
     soup = Soup(response.body, 'html.parser')
     assert len(soup.findAll('textarea', {'name': 'sql'}))
@@ -509,8 +503,7 @@ def test_allow_sql_off():
         'allow_sql': False,
     }):
         response = client.get(
-            "/test_tables",
-            gather_request=False
+            "/test_tables"
         )
         soup = Soup(response.body, 'html.parser')
         assert not len(soup.findAll('textarea', {'name': 'sql'}))
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index c53dfc4e..96ffc8d9 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -7,14 +7,13 @@ import pytest
 
 def test_plugins_dir_plugin(app_client):
     response = app_client.get(
-        "/test_tables.json?sql=select+convert_units(100%2C+'m'%2C+'ft')",
-        gather_request=False
+        "/test_tables.json?sql=select+convert_units(100%2C+'m'%2C+'ft')"
     )
     assert pytest.approx(328.0839) == response.json['rows'][0][0]
 
 
 def test_plugin_extra_css_urls(app_client):
-    response = app_client.get('/', gather_request=False)
+    response = app_client.get('/')
     links = Soup(response.body, 'html.parser').findAll('link')
     assert [
         l for l in links
@@ -26,7 +25,7 @@ def test_plugin_extra_css_urls(app_client):
 
 
 def test_plugin_extra_js_urls(app_client):
-    response = app_client.get('/', gather_request=False)
+    response = app_client.get('/')
     scripts = Soup(response.body, 'html.parser').findAll('script')
     assert [
         s for s in scripts
@@ -41,8 +40,7 @@ def test_plugin_extra_js_urls(app_client):
 def test_plugins_with_duplicate_js_urls(app_client):
     # If two plugins both require jQuery, jQuery should be loaded only once
     response = app_client.get(
-        "/test_tables",
-        gather_request=False
+        "/test_tables"
     )
     # This test is a little tricky, as if the user has any other plugins in
     # their current virtual environment those may affect what comes back too.