Merge branch '1.2.x'

modoboa/extensions/admin/tests/alias.py

@@ -35,6 +35,30 @@ class AliasTestCase(ModoTestCase):
         )
         self.assertEqual(user.mailbox_set.all()[0].alias_set.count(), 1)
 
+    def test_upper_case_alias(self):
+        """Try to create an upper case alias."""
+        user = User.objects.get(username="user@test.com")
+        values = dict(
+            username="user@test.com", role=user.group,
+            is_active=user.is_active, email="user@test.com",
+            aliases="Toto@test.com"
+        )
+        self.ajax_post(
+            reverse("admin:account_change", args=[user.id]),
+            values
+        )
+        self.assertEqual(user.mailbox_set.first().alias_set.count(), 1)
+        self.assertEqual(
+            user.mailbox_set.first().alias_set.first(), "toto@test.com")
+
+        values = {
+            "email": "Titi@test.com", "recipient": "user@test.com",
+            "enabled": True
+        }
+        self.ajax_post(reverse("admin:alias_add"), values)
+        self.assertEqual(
+            user.mailbox_set.first().alias_set.first(), "titi@test.com")
+
     def test_dlist(self):
         values = dict(email="all@test.com",
                       recipients="user@test.com",

tests/install_from_scratch.py

@@ -9,11 +9,11 @@ from modoboa.lib.sysutils import exec_cmd
 
 
 class DeployTest(unittest.TestCase):
-    dbtype = "mysql"
+    dbtype = "postgres"
     dbhost = "localhost"
     projname = "modoboa_test"
     dbuser = "travis"
-    dbpassword = ""
+    dbpassword = "toto"
 
     def setUp(self):
         self.workdir = tempfile.mkdtemp()
@@ -70,6 +70,7 @@ class DeployTest(unittest.TestCase):
             % (dburl, 'localhost', self.projname)
         )
         code, output = exec_cmd(cmd, cwd=self.workdir)
+        print output
         self.assertEqual(code, 0)