From acb403a9c5009556c0bedf6c0f52f1416c193a81 Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: May 13 2019 08:13:50 +0000 Subject: Allow optional trailing slash for about endpoint Accessing "api/v1.0/about/" shouldn't give 404. Signed-off-by: Lukas Holecek --- diff --git a/tests/test_api_v10.py b/tests/test_api_v10.py index ca14aef..38a3ece 100644 --- a/tests/test_api_v10.py +++ b/tests/test_api_v10.py @@ -628,10 +628,12 @@ def test_waivers_by_subjects_and_testcases_with_malformed_since(client, session) "time data 'asdf' does not match format '%Y-%m-%dT%H:%M:%S.%f'" -def test_about_endpoint(client): - r = client.get('/api/v1.0/about') - output = json.loads(r.get_data(as_text=True)) +@pytest.mark.parametrize('trailing_slash', ('', '/')) +def test_about_endpoint(client, trailing_slash): + r = client.get('/api/v1.0/about' + trailing_slash) assert r.status_code == 200 + + output = json.loads(r.get_data(as_text=True)) assert output['version'] == __version__ assert output['auth_method'] == client.application.config['AUTH_METHOD'] diff --git a/waiverdb/api_v1.py b/waiverdb/api_v1.py index 420d2ce..929933b 100644 --- a/waiverdb/api_v1.py +++ b/waiverdb/api_v1.py @@ -668,5 +668,5 @@ api.add_resource(WaiversResource, '/waivers/') api.add_resource(WaiverResource, '/waivers/') api.add_resource(FilteredWaiversResource, '/waivers/+filtered') api.add_resource(GetWaiversBySubjectsAndTestcases, '/waivers/+by-subjects-and-testcases') -api.add_resource(AboutResource, '/about') +api.add_resource(AboutResource, '/about', strict_slashes=False) api.add_resource(MonitorResource, '/metrics')