From 5030a8ea149caa7c7c544bdc492aa276c79eae75 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 9 Mar 2019 17:20:37 +0100 Subject: Autocomplete: small fix and general tests --- archaeological_files/tests.py | 18 +++++++++++++++++- archaeological_files/views.py | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'archaeological_files') diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py index d78fa0e68..b8755ecbd 100644 --- a/archaeological_files/tests.py +++ b/archaeological_files/tests.py @@ -25,7 +25,8 @@ from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.test.client import Client -from ishtar_common.tests import TestCase, COMMON_FIXTURES, create_superuser +from ishtar_common.tests import TestCase, COMMON_FIXTURES, create_superuser, \ + AutocompleteTestBase, AcItem from ishtar_common.models import Town, IshtarSiteProfile from archaeological_files import models @@ -302,3 +303,18 @@ class DashboardTest(TestCase, FileInit): response = c.get(reverse(url)) self.assertEqual(response.status_code, 200) + + +class AutocompleteTest(AutocompleteTestBase, TestCase): + fixtures = FILE_TOWNS_FIXTURES + models = [ + AcItem(models.File, 'autocomplete-file', + prepare_func="create_file"), + ] + + def create_file(self, base_name): + item, __ = models.File.objects.get_or_create( + name=base_name, + file_type=models.FileType.objects.all()[0] + ) + return item, None diff --git a/archaeological_files/views.py b/archaeological_files/views.py index e038c515f..50f3a86d2 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -58,7 +58,7 @@ def autocomplete_file(request): for q in q.split(' '): extra = Q(internal_reference__icontains=q) | \ Q(towns__name__icontains=q) | \ - Q(address__icontains=q) + Q(address__icontains=q) | Q(name__icontains=q) try: int(q) extra = extra | Q(year=q) | Q(numeric_reference=q) -- cgit v1.2.3