From 0f782dd8dfd7c53a9c20bbd2cb8734bb806d928b Mon Sep 17 00:00:00 2001 From: Russ Garrett Date: Mon, 16 Apr 2018 21:22:04 +0100 Subject: [PATCH] Additional test asserts --- tests/test_html.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tests/test_html.py b/tests/test_html.py index 15ab8d41..239d5354 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -163,16 +163,18 @@ def test_sort_by_desc_redirects(app_client): ]) def test_css_classes_on_body(app_client, path, expected_classes): response = app_client.get(path, gather_request=False) + assert response.status == 200 classes = re.search(r'', 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) + assert response.status == 200 table = Soup(response.body, 'html.parser').find('table') ths = table.findAll('th') - assert 'Link' == ths[0].string.strip() - for expected_col, th in zip(('id', 'content'), ths[1:]): + assert 'id' == ths[0].find('a').string.strip() + for expected_col, th in zip(('content',), ths[1:]): a = th.find('a') assert expected_col == a.string assert a['href'].endswith('/simple_primary_key?_sort={}'.format( @@ -182,15 +184,12 @@ def test_table_html_simple_primary_key(app_client): assert [ [ '1', - '1', 'hello' ], [ '2', - '2', 'world' ], [ '3', - '3', '' ] ] == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')] @@ -198,6 +197,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) + assert response.status == 200 table = Soup(response.body, 'html.parser').find('table') assert [ 'id', 'content' @@ -218,6 +218,7 @@ def test_table_not_exists(app_client): def test_table_html_no_primary_key(app_client): response = app_client.get('/test_tables/no_primary_key', gather_request=False) + assert response.status == 200 table = Soup(response.body, 'html.parser').find('table') # We have disabled sorting for this table using metadata.json assert [ @@ -238,6 +239,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) + assert response.status == 200 table = Soup(response.body, 'html.parser').find('table') assert [ 'rowid', 'content', 'a', 'b', 'c' @@ -256,6 +258,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) + assert response.status == 200 table = Soup(response.body, 'html.parser').find('table') ths = table.findAll('th') assert 'Link' == ths[0].string.strip() @@ -278,11 +281,11 @@ 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) + assert response.status == 200 table = Soup(response.body, 'html.parser').find('table') expected = [ [ '1', - '1', 'hello\xa01', '1' ] @@ -292,6 +295,7 @@ def test_table_html_foreign_key_links(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) + assert response.status == 200 table = Soup(response.body, 'html.parser').find('table') assert [ 'pk1', 'pk2', 'content' @@ -308,6 +312,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) + assert response.status == 200 table = Soup(response.body, 'html.parser').find('table') assert [ 'content', 'upper_content' @@ -329,6 +334,7 @@ def test_view_html(app_client): def test_index_metadata(app_client): response = app_client.get('/', gather_request=False) + assert response.status == 200 soup = Soup(response.body, 'html.parser') assert 'Datasette Title' == soup.find('h1').text assert 'Datasette Description' == inner_html( @@ -339,6 +345,7 @@ def test_index_metadata(app_client): def test_database_metadata(app_client): response = app_client.get('/test_tables', gather_request=False) + assert response.status == 200 soup = Soup(response.body, 'html.parser') # Page title should be the default assert 'test_tables' == soup.find('h1').text @@ -352,6 +359,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) + assert response.status == 200 soup = Soup(response.body, 'html.parser') # Page title should be custom and should be HTML escaped assert 'This <em>HTML</em> is escaped' == inner_html(soup.find('h1'))