From 6db1029d275e7898c6a766e15753bcddc25d7fb0 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Mon, 1 Aug 2022 15:50:14 -0700 Subject: [PATCH] help: tests: Fix about page test by mocking version calls Signed-off-by: Sunil Mohan Adapa --- plinth/modules/help/tests/test_views.py | 8 +++++--- plinth/modules/help/views.py | 9 ++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/plinth/modules/help/tests/test_views.py b/plinth/modules/help/tests/test_views.py index 9c6037d58..b61730329 100644 --- a/plinth/modules/help/tests/test_views.py +++ b/plinth/modules/help/tests/test_views.py @@ -87,10 +87,12 @@ def test_contribute_page(requests_get, decompress, apt_cache, rf): response.context_data['help']) -def test_about(rf): +@patch('plinth.modules.upgrades.views.is_newer_version_available') +@patch('plinth.modules.upgrades.views.get_os_release') +def test_about(_get_os_release, _is_newer_version_available, rf): """Test some expected items in about view.""" - manual_url = urls.reverse('help:manual') - response = views.about(rf.get(manual_url)) + about_url = urls.reverse('help:about') + response = views.about(rf.get(about_url)) assert _is_page(response) for item in ('version', 'new_version', 'os_release'): assert item in response.context_data diff --git a/plinth/modules/help/views.py b/plinth/modules/help/views.py index c98656665..f18d0dd1b 100644 --- a/plinth/modules/help/views.py +++ b/plinth/modules/help/views.py @@ -10,17 +10,16 @@ import os import pathlib import apt +import requests from django.core.files.base import File from django.http import Http404, HttpResponse, HttpResponseRedirect from django.template.response import TemplateResponse from django.urls import reverse from django.utils.translation import get_language_from_request from django.utils.translation import gettext as _ -import requests from plinth import __version__, actions, cfg -from plinth.modules.upgrades.views import (get_os_release, - is_newer_version_available) +from plinth.modules.upgrades import views as upgrades_views def index(request): @@ -96,8 +95,8 @@ def about(request): context = { 'title': _('About {box_name}').format(box_name=_(cfg.box_name)), 'version': __version__, - 'new_version': is_newer_version_available(), - 'os_release': get_os_release() + 'new_version': upgrades_views.is_newer_version_available(), + 'os_release': upgrades_views.get_os_release() } return TemplateResponse(request, 'help_about.html', context)