Merge branch 'v0.9' into wheezy

1 files changed, 9 insertions, 2 deletions

diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index a3fa62ce7..82acb1904 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -650,7 +650,7 @@ class ShortMenuTest(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertTrue(str(basket.label) in response.content)
 
-    def testTreatmentFile(self):
+    def test_treatment_file(self):
         c = Client()
         c.login(username=self.username, password=self.password)
         from archaeological_finds.models import TreatmentFile, TreatmentFileType
@@ -693,7 +693,7 @@ class ShortMenuTest(TestCase):
             year=2052
         )
 
-    def testTreatment(self):
+    def test_treatment(self):
         c = Client()
         c.login(username=self.username, password=self.password)
         treat = self._create_treatment()
@@ -747,6 +747,13 @@ class ShortMenuTest(TestCase):
         self.assertFalse(c.session['find'])
         self.assertFalse(c.session['contextrecord'])
 
+        # current find is set as an integer
+        session = c.session
+        session['find'] = find.id
+        session.save()
+        response = c.get(reverse('shortcut-menu'))
+        self.assertEqual(response.status_code, 200)
+
         self._create_treatment()
 
     def test_basket_is_current_item(self):