Merge branch 'saclay'

Conflicts:
	chimere/migrations/0029_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py
	chimere/migrations/0029_auto__add_propertymodelchoice.py
	chimere/migrations/0030_auto__add_field_importer_default_name.py
	chimere/migrations/0031_auto__add_field_subcategory_dated.py
	chimere/migrations/0031_auto__chg_field_picturefile_width__chg_field_picturefile_height.py
	chimere/migrations/0032_auto__add_field_subcategory_submission.py
	chimere/migrations/0033_auto__add_field_importer_source_file.py
	chimere/migrations/0034_auto__add_field_importer_origin__add_field_importer_license__add_field.py
	chimere/migrations/0035_area_permissions.py
	chimere/migrations/0035_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py
	chimere/migrations/0036_auto.py
	chimere/migrations/0036_auto__add_field_importer_default_name.py
	chimere/migrations/0037_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py
	chimere/migrations/0038_auto__chg_field_picturefile_width__chg_field_picturefile_height.py
	chimere/migrations/0039_auto__add_multimediaextension__chg_field_multimediafile_multimedia_typ.py
	chimere/migrations/0040_remove_excluded_status.py
	chimere/migrations/0041_auto__add_field_importer_overwrite.py
	chimere/migrations/0041_auto__add_field_importer_source_file.py
	chimere/migrations/0042_auto__add_field_importer_origin__add_field_importer_license__add_field.py
	chimere/migrations/0042_fix_rights.py
	chimere/migrations/0043_area_permissions.py
	chimere/migrations/0043_auto__add_field_importer_get_description.py
	chimere/migrations/0044_auto.py
	chimere/migrations/0044_auto__add_field_importer_default_description.py
	chimere/migrations/0046_auto__del_field_subcategory_routing_available.py
	chimere/migrations/0047_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py
	chimere/migrations/0049_auto__chg_field_multimediafile_multimedia_type.py
	chimere/migrations/0050_remove_excluded_status.py
	chimere/migrations/0051_auto__add_field_importer_overwrite.py
	chimere/migrations/0054_fix_rights.py
	chimere/old_migrations/v2.0/0029_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py
	chimere/old_migrations/v2.0/0030_auto__add_field_importer_default_name.py
	chimere/old_migrations/v2.0/0031_auto__chg_field_picturefile_width__chg_field_picturefile_height.py
	chimere/old_migrations/v2.0/0032_auto__add_field_subcategory_submission.py
	chimere/old_migrations/v2.0/0033_auto__add_field_importer_source_file.py
	chimere/old_migrations/v2.0/0034_auto__add_field_importer_origin__add_field_importer_license__add_field.py
	chimere/old_migrations/v2.0/0035_area_permissions.py
	chimere/old_migrations/v2.0/0036_auto.py
	chimere/old_migrations/v2.0/0037_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py
	chimere/old_migrations/v2.0/0038_osm_import_filtr.py
	chimere/old_migrations/v2.0/0039_auto__add_multimediaextension__chg_field_multimediafile_multimedia_typ.py
	chimere/old_migrations/v2.0/0040_remove_excluded_status.py
	chimere/old_migrations/v2.0/0041_auto__add_field_importer_overwrite.py
	chimere/old_migrations/v2.0/0042_fix_rights.py
	chimere/old_migrations/v2.0/0043_auto__add_field_importer_get_description.py
	chimere/old_migrations/v2.0/0044_auto__add_field_importer_default_description.py

1 files changed, 21 insertions, 5 deletions

diff --git a/chimere/tests.py b/chimere/tests.py
index 54c1acd..fb48205 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
 
@@ -90,12 +91,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))
@@ -259,8 +262,14 @@ class OSMImporterTest(TestCase, ImporterTest):
         importer2 = Importer.objects.create(importer_type='OSM',
             source=test_dir_path+'tests/sample_ways.osm')
         importer2.categories.add(subcategories[1])
+        importer3 = Importer.objects.create(importer_type='OSM',
+            source='http://open.mapquestapi.com/xapi/api/0.6/way'\
+                   '[highway=motorway]'\
+                   '[bbox=2.0393839939136975,48.68908639634696,'\
+                   '2.3140421970277316,48.790972349390415]')
 
-        self.marker_importers = [(importer1, 19), (importer2, 8)]
+        self.marker_importers = [(importer1, 19), (importer2, 8),
+                                 (importer3, None)]
 
 class GeoRSSImporterTest(TestCase, ImporterTest):
     def setUp(self):
@@ -400,6 +409,13 @@ class DynamicCategoryTest(TestCase):
         cats = self.areas[2].getCategories(status='A', filter_available=True)
         self.assertEqual(len(cats), 2)
 
+    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()
@@ -411,10 +427,10 @@ class NewsTest(TestCase):
                       start_date=current_date - datetime.timedelta(days=90),
                       end_date=None)
         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({}))