github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to httpx 0.20

Browse source 
* Upgrade to httpx 0.20, closes #1488
* TestClient.post() should not default to following redirects
This commit is contained in:
Simon Willison 2021-10-14 11:03:44 -07:00 • committed by GitHub
commit b267b57754
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 60 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

38
tests/test_html.py
View file

@ -100,9 +100,9 @@ def test_not_allowed_methods():
def test_database_page_redirects_with_url_hash(app_client_with_hash):
response = app_client_with_hash.get("/fixtures", allow_redirects=False)
assert response.status == 302
response = app_client_with_hash.get("/fixtures")
assert response.status == 302
response = app_client_with_hash.get("/fixtures", follow_redirects=True)
assert "fixtures" in response.text
@ -161,22 +161,22 @@ def test_sql_time_limit(app_client_shorter_time_limit):
def test_row_redirects_with_url_hash(app_client_with_hash):
response = app_client_with_hash.get(
"/fixtures/simple_primary_key/1", allow_redirects=False
)
response = app_client_with_hash.get("/fixtures/simple_primary_key/1")
assert response.status == 302
assert response.headers["Location"].endswith("/1")
response = app_client_with_hash.get("/fixtures/simple_primary_key/1")
response = app_client_with_hash.get(
"/fixtures/simple_primary_key/1", follow_redirects=True
)
assert response.status == 200
def test_row_strange_table_name_with_url_hash(app_client_with_hash):
response = app_client_with_hash.get(
"/fixtures/table%2Fwith%2Fslashes.csv/3", allow_redirects=False
)
response = app_client_with_hash.get("/fixtures/table%2Fwith%2Fslashes.csv/3")
assert response.status == 302
assert response.headers["Location"].endswith("/table%2Fwith%2Fslashes.csv/3")
response = app_client_with_hash.get("/fixtures/table%2Fwith%2Fslashes.csv/3")
response = app_client_with_hash.get(
"/fixtures/table%2Fwith%2Fslashes.csv/3", follow_redirects=True
)
assert response.status == 200
@ -255,13 +255,13 @@ def test_add_filter_redirects(app_client):
)
path_base = "/fixtures/simple_primary_key"
path = path_base + "?" + filter_args
response = app_client.get(path, allow_redirects=False)
response = app_client.get(path)
assert response.status == 302
assert response.headers["Location"].endswith("?content__startswith=x")
# Adding a redirect to an existing query string:
path = path_base + "?foo=bar&" + filter_args
response = app_client.get(path, allow_redirects=False)
response = app_client.get(path)
assert response.status == 302
assert response.headers["Location"].endswith("?foo=bar&content__startswith=x")
@ -277,7 +277,7 @@ def test_add_filter_redirects(app_client):
}
)
)
response = app_client.get(path, allow_redirects=False)
response = app_client.get(path)
assert response.status == 302
assert response.headers["Location"].endswith("?content__isnull=5")
@ -299,7 +299,7 @@ def test_existing_filter_redirects(app_client):
}
path_base = "/fixtures/simple_primary_key"
path = path_base + "?" + urllib.parse.urlencode(filter_args)
response = app_client.get(path, allow_redirects=False)
response = app_client.get(path)
assert response.status == 302
assert_querystring_equal(
"name__contains=hello&age__gte=22&age__lt=30&name__contains=world",
@ -309,7 +309,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)
response = app_client.get(path)
assert response.status == 302
assert_querystring_equal(
"name__contains=hello&age__gte=22&name__contains=world",
@ -317,7 +317,7 @@ 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)
response = app_client.get(path_base + "?_filter_op=exact")
assert response.status == 302
assert "?" not in response.headers["Location"]
@ -336,7 +336,7 @@ def test_empty_search_parameter_gets_removed(app_client):
}
)
)
response = app_client.get(path, allow_redirects=False)
response = app_client.get(path)
assert response.status == 302
assert response.headers["Location"].endswith("?name__exact=chidi")
@ -360,7 +360,7 @@ def test_sort_by_desc_redirects(app_client):
+ "?"
+ urllib.parse.urlencode({"_sort": "sortable", "_sort_by_desc": "1"})
)
response = app_client.get(path, allow_redirects=False)
response = app_client.get(path)
assert response.status == 302
assert response.headers["Location"].endswith("?_sort_desc=sortable")
@ -1148,7 +1148,7 @@ def test_404(app_client, path):
[("/fixtures/", "/fixtures"), ("/fixtures/simple_view/", "/fixtures/simple_view")],
)
def test_404_trailing_slash_redirect(app_client, path, expected_redirect):
response = app_client.get(path, allow_redirects=False)
response = app_client.get(path)
assert 302 == response.status
assert expected_redirect == response.headers["Location"]