Merge branch 'master' into v0.9

Conflicts:
	ishtar_common/migrations/0030_auto__add_state__chg_field_sourcetype_txt_idx__chg_field_authortype_tx.py

1 files changed, 10 insertions, 1 deletions

diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 82acb1904..42bb1860e 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -319,6 +319,15 @@ class AdminGenTypeTest(TestCase):
         for model in self.models_with_data:
             self.assertTrue(str(model.objects.all()[0]))
 
+    def test_user_creation(self):
+        url = '/admin/auth/user/add/'
+        password = 'ishtar is the queen'
+        response = self.client.post(
+            url, {'username': 'test', 'password1': password,
+                  'password2': password})
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(self.client.login(username='test', password=password))
+
 
 class MergeTest(TestCase):
     def setUp(self):
@@ -798,7 +807,7 @@ class ImportTest(TestCase):
         # town should be deleted
         self.assertEqual(models.Town.objects.filter(name='my-test').count(), 0)
 
-    def testKeys(self):
+    def test_keys(self):
         content_type = ContentType.objects.get_for_model(
             models.OrganizationType)