From f25285634613ff5beeb0c360d817835738e72b40 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 31 Oct 2012 15:31:30 +0100 Subject: JS: preload icon images --- chimere/tests.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'chimere/tests.py') diff --git a/chimere/tests.py b/chimere/tests.py index c372202..ea97b39 100644 --- a/chimere/tests.py +++ b/chimere/tests.py @@ -4,6 +4,7 @@ import datetime import lxml.etree import os +import simplejson as json test_path = os.path.abspath(__file__) test_dir_path = os.path.dirname(test_path) + os.sep @@ -67,12 +68,14 @@ def marker_setup(sub_categories=[]): markers.append(marker_1) marker_2 = Marker.objects.create(name="Marker 2", status='A', point='SRID=4326;POINT(-3.5 48.4)', + is_front_page=True, available_date=current_date, start_date=current_date) marker_2.categories.add(sub_categories[1]) markers.append(marker_2) marker_3 = Marker.objects.create(name="Marker 3", status='A', point='SRID=4326;POINT(-4.5 48.45)', + is_front_page=True, available_date=current_date - datetime.timedelta(days=60), start_date=current_date - datetime.timedelta(days=60), end_date=current_date - datetime.timedelta(days=30)) @@ -204,7 +207,7 @@ class MarkerFormTest(TestCase): form = MarkerForm(data) self.assertEqual(form.is_valid(), False) -class DynamicCategoryTest(TestCase): +class CategoryTest(TestCase): def setUp(self): self.areas = areas_setup() self.markers = marker_setup() @@ -213,15 +216,22 @@ class DynamicCategoryTest(TestCase): cats = self.areas[0].getCategories(status='A', filter_available=True) self.assertEqual(len(cats), 1) + def test_get_all_categories(self): + url = reverse('chimere:get_all_categories') + response = self.client.get(url) + self.assertEqual(200, response.status_code) + cats = json.loads(response.content)['categories'] + self.assertEqual(len(cats), 2) + class NewsTest(TestCase): def setUp(self): self.areas = areas_setup() self.markers = marker_setup() self.news = [] - self.news.append(News.objects.create(title=u"Test news 1", - available=True)) - self.news.append(News.objects.create(title=u"Test news 2", - available=False)) + self.news.append(News.objects.create(is_front_page=True, + title=u"Test news 1", available=True)) + self.news.append(News.objects.create(is_front_page=True, + title=u"Test news 2", available=False)) def test_news_display(self): context = display_news(Context({})) -- cgit v1.2.3