From a7389a3d8f5dcb8388df050e04178a2c20f17c19 Mon Sep 17 00:00:00 2001 From: Lacey Williams Henschel Date: Wed, 8 Feb 2023 14:52:43 -0800 Subject: [PATCH 1/3] :hammer: Order versions in descending order by release date --- versions/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/views.py b/versions/views.py index 1f86eaa8..07c2df84 100755 --- a/versions/views.py +++ b/versions/views.py @@ -7,7 +7,7 @@ class VersionList(ListView): """Web display of list of Versions""" model = Version - queryset = Version.objects.active() + queryset = Version.objects.active().order_by("-release_date") template_name = "versions/list.html" def get_context_data(self): From b2401bb0d8fa121ba0222cfdc6012875c180b4d8 Mon Sep 17 00:00:00 2001 From: Lacey Williams Henschel Date: Sat, 11 Feb 2023 06:33:47 -0800 Subject: [PATCH 2/3] :umbrella: Test version list order --- versions/tests/fixtures.py | 2 +- versions/tests/test_views.py | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/versions/tests/fixtures.py b/versions/tests/fixtures.py index 63eb4974..44eb1f5d 100644 --- a/versions/tests/fixtures.py +++ b/versions/tests/fixtures.py @@ -61,7 +61,7 @@ def old_version(db): last_year = datetime.date.today() - datetime.timedelta(days=365) v = baker.make( "versions.Version", - name="Version 1.79.0", + name="Version 1.70.0", description="Some awesome description of the library", release_date=last_year, ) diff --git a/versions/tests/test_views.py b/versions/tests/test_views.py index 3058608b..6106b5f3 100644 --- a/versions/tests/test_views.py +++ b/versions/tests/test_views.py @@ -1,4 +1,9 @@ -def test_version_list(version, tp): +import datetime + +from model_bakery import baker + + +def test_version_list(version, old_version, tp): """ GET /versions/ """ @@ -10,14 +15,22 @@ def test_version_list_context(version, old_version, inactive_version, tp): """ GET /versions/ """ + older_version = baker.make( + "versions.Version", + name="Version 1.67.0", + description="Sample", + release_date=datetime.date.today() - datetime.timedelta(days=700), + ) res = tp.get("version-list") tp.response_200(res) assert "current_version" in res.context assert "version_list" in res.context + assert len(res.context["version_list"]) == 2 assert res.context["current_version"] == version assert old_version in res.context["version_list"] + assert older_version in res.context["version_list"] + assert old_version == res.context["version_list"][0] assert inactive_version not in res.context["version_list"] - assert len(res.context["version_list"]) == 1 def test_version_detail(version, tp): From d5f680b636ed1789b81ee66d6f989a6f0650058b Mon Sep 17 00:00:00 2001 From: Lacey Williams Henschel Date: Sat, 11 Feb 2023 06:35:43 -0800 Subject: [PATCH 3/3] :fire: Unneeded code --- versions/tests/test_views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/tests/test_views.py b/versions/tests/test_views.py index 6106b5f3..18c9c345 100644 --- a/versions/tests/test_views.py +++ b/versions/tests/test_views.py @@ -3,7 +3,7 @@ import datetime from model_bakery import baker -def test_version_list(version, old_version, tp): +def test_version_list(version, tp): """ GET /versions/ """