From fb6b8e36ed49606d508daf778282be5d4cc69940 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Mon, 3 May 2021 17:52:11 +0100 Subject: [PATCH] Fix tests 6 --- app/models/packages.py | 4 +++- app/tests/test_api.py | 7 ++++--- app/tests/test_homepage.py | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/models/packages.py b/app/models/packages.py index 5462af7..35f762c 100644 --- a/app/models/packages.py +++ b/app/models/packages.py @@ -795,7 +795,9 @@ class MinetestRelease(db.Model): return release if protocol_num: - return MinetestRelease.query.filter_by(protocol=protocol_num).first() + # Find the closest matching release + return MinetestRelease.query.order_by(db.desc(MinetestRelease.protocol)) \ + .filter(MinetestRelease.protocol <= protocol_num).first() return None diff --git a/app/tests/test_api.py b/app/tests/test_api.py index dd8d151..e5e8aa0 100644 --- a/app/tests/test_api.py +++ b/app/tests/test_api.py @@ -74,14 +74,15 @@ def test_packages_with_protocol_high(client): populate_test_data(db.session) db.session.commit() - rv = client.get("/api/packages/?protocol_version=40") + rv = client.get("/api/packages/?protocol_version=100") packages = parse_json(rv.data) - assert len(packages) == 4 - for package in packages: assert package["name"] != "mesecons" + assert package["name"] != "handholds" + + assert len(packages) == 4 validate_package_list(packages, True) diff --git a/app/tests/test_homepage.py b/app/tests/test_homepage.py index 6b3abc6..fd0e811 100644 --- a/app/tests/test_homepage.py +++ b/app/tests/test_homepage.py @@ -7,7 +7,7 @@ def test_homepage_empty(client): """Start with a blank database.""" rv = client.get("/") - assert b"No packages available" in rv.data and b"packagetile" not in rv.data + assert b"No packages available" in rv.data and b"packagegridscrub" not in rv.data def test_homepage_with_contents(client): @@ -18,4 +18,4 @@ def test_homepage_with_contents(client): rv = client.get("/") - assert b"No packages available" not in rv.data and b"packagetile" in rv.data + assert b"packagegridscrub" in rv.data