diff options
| author | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-02-02 12:16:07 +0100 |
|---|---|---|
| committer | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-02-02 12:16:07 +0100 |
| commit | 959ee7f2e7bbe433c3d6f4a52ff357ab6a7c2807 (patch) | |
| tree | aa0f67f35f2d1de71291562379ed8212b81e697a | |
| parent | 648718b9f2edc902eb746c1200106850c51e6abc (diff) | |
| parent | d6aa2048e1d7c862e5f8c65c7d2f382137855ce6 (diff) | |
| download | Chimère-959ee7f2e7bbe433c3d6f4a52ff357ab6a7c2807.tar.bz2 Chimère-959ee7f2e7bbe433c3d6f4a52ff357ab6a7c2807.zip | |
Merge branch 'master' of git.iggdrasil.net:/srv/git/chimere
| -rw-r--r-- | chimere/templates/chimere/edit_polygon.html | 2 | ||||
| -rw-r--r-- | chimere/templates/chimere/edit_route.html | 2 | ||||
| -rw-r--r-- | chimere/tests.py | 25 |
3 files changed, 27 insertions, 2 deletions
diff --git a/chimere/templates/chimere/edit_polygon.html b/chimere/templates/chimere/edit_polygon.html index 7bba0d0..d291859 100644 --- a/chimere/templates/chimere/edit_polygon.html +++ b/chimere/templates/chimere/edit_polygon.html @@ -1,5 +1,5 @@ {% extends "chimere/edit.html" %} -{% load i18n chimere_tags adminmedia inline_formset%} +{% load i18n chimere_tags inline_formset%} {% block legend %} <legend>{% if is_modification %}{% trans "Modify a polygon" %}{% else %}{% trans "Add a polygon" %}{% endif %}</legend> diff --git a/chimere/templates/chimere/edit_route.html b/chimere/templates/chimere/edit_route.html index 7012b57..e5a7293 100644 --- a/chimere/templates/chimere/edit_route.html +++ b/chimere/templates/chimere/edit_route.html @@ -1,5 +1,5 @@ {% extends "chimere/edit.html" %} -{% load i18n chimere_tags adminmedia inline_formset%} +{% load i18n chimere_tags inline_formset%} {% block legend %} <legend>{% if is_modification %}{% trans "Modify a route" %}{% else %}{% trans "Add a route" %}{% endif %}</legend> diff --git a/chimere/tests.py b/chimere/tests.py index 9360b76..ad54532 100644 --- a/chimere/tests.py +++ b/chimere/tests.py @@ -380,6 +380,31 @@ class FeedsTest(TestCase): self.assertEqual(int(doc.xpath('count(//item)')), 2) +class MainUITest(TestCase): + def setUp(self): + self.areas = areas_setup() + self.subcategories = subcategory_setup() + self.markers = marker_setup() + + def test_pages(self): + url = reverse('chimere:index') + response = self.client.get(url) + self.assertEqual(200, response.status_code) + url = reverse('chimere:edit') + url_editmarker = reverse('chimere:editmarker') + response = self.client.get(url) + self.assertRedirects(response, url_editmarker) + response = self.client.get(url_editmarker) + self.assertEqual(200, response.status_code) + url = reverse('chimere:editroute') + response = self.client.get(url) + self.assertEqual(200, response.status_code) + url = reverse('chimere:editpolygon') + response = self.client.get(url) + self.assertEqual(200, response.status_code) + + + class AdministratorsTest(TestCase): def setUp(self): self.areas = areas_setup() |