X-Git-Url: https://git.jsancho.org/?p=datasette-connectors.git;a=blobdiff_plain;f=tests%2Ftest_api.py;fp=tests%2Ftest_api.py;h=2d74c95f15fe2edd656d11c2226bc8e583d71beb;hp=63555cddf7dc2e62b519708939c4e03ce30773d7;hb=52416a749fac092a032a8b5239e477dd68180dfa;hpb=1a34f766bbcada99da81fabdc93b802e4ff8fb2a diff --git a/tests/test_api.py b/tests/test_api.py index 63555cd..2d74c95 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -2,7 +2,7 @@ from .fixtures import app_client from urllib.parse import urlencode def test_homepage(app_client): - _, response = app_client.get('/.json') + response = app_client.get('/.json') assert response.status == 200 assert response.json.keys() == {'dummy_tables': 0}.keys() d = response.json['dummy_tables'] @@ -10,28 +10,12 @@ def test_homepage(app_client): assert d['tables_count'] == 2 def test_database_page(app_client): - response = app_client.get('/dummy_tables.json', gather_request=False) + response = app_client.get('/dummy_tables.json') data = response.json assert 'dummy_tables' == data['database'] - assert [{ - 'name': 'table1', - 'columns': ['c1', 'c2', 'c3'], - 'primary_keys': [], - 'count': 2, - 'label_column': None, - 'hidden': False, - 'fts_table': None, - 'foreign_keys': {'incoming': [], 'outgoing': []} - }, { - 'name': 'table2', - 'columns': ['c1', 'c2', 'c3'], - 'primary_keys': [], - 'count': 2, - 'label_column': None, - 'hidden': False, - 'fts_table': None, - 'foreign_keys': {'incoming': [], 'outgoing': []} - }] == data['tables'] + assert len(data['tables']) == 2 + assert data['tables'][0]['count'] == 2 + assert data['tables'][0]['columns'] == ['c1', 'c2', 'c3'] def test_custom_sql(app_client): response = app_client.get( @@ -39,7 +23,6 @@ def test_custom_sql(app_client): 'sql': 'select c1 from table1', '_shape': 'objects' }), - gather_request=False ) data = response.json assert {