Merge pull request #1287 from leonelcamara/test_week6

Test week6

gluon/tests/test_tools.py

@@ -176,6 +176,19 @@ class TestMail(unittest.TestCase):
         attachment = parsed_msg.get_payload(1).get_payload(decode=True)
         with open(module_file, 'rb') as mf:
             self.assertEqual(attachment.decode('utf-8'), mf.read().decode('utf-8'))
+        # Test missing attachment name error
+        stream = open(module_file)
+        self.assertRaises(Exception, lambda *args, **kwargs: Mail.Attachment(*args, **kwargs), stream)
+        stream.close()
+        # Test you can define content-id and content type
+        self.assertTrue(mail.send(to=['somebody@example.com'],
+                                  subject='hello',
+                                  message='world',
+                                  attachments=Mail.Attachment(module_file, content_id='trololo', content_type='tra/lala')))
+        message = TestMail.DummySMTP.inbox.pop()
+        self.assertTrue('Content-Type: tra/lala' in message.payload)
+        self.assertTrue('Content-Id: <trololo>' in message.payload)
+
 
 # class TestRecaptcha(unittest.TestCase):
 #     def test_Recaptcha(self):

gluon/tests/test_validators.py

@@ -230,6 +230,8 @@ class TestValidators(unittest.TestCase):
         self.assertEqual(rtn, ( ('%d,%d' % (george_id, costanza_id)).split(','), 'oops'))
         rtn = IS_IN_DB(db, db.person.id, '%(name)s', error_message='oops').options(zero=False)
         self.assertEqual(sorted(rtn), [('%d' % george_id, 'george'), ('%d' % costanza_id, 'costanza')])
+        rtn = IS_IN_DB(db, db.person.id, db.person.name, error_message='oops', sort=True).options(zero=True)
+        self.assertEqual(rtn, [('', ''), ('%d' % costanza_id, 'costanza'), ('%d' % george_id, 'george')])
         db.person.drop()
 
     def test_IS_NOT_IN_DB(self):

gluon/tools.py

@@ -4512,7 +4512,7 @@ class Auth(object):
                           ignore_common_filters=True).select(
             limitby=(0, 1), orderby_on_limitby=False).first()
         if record:
-            if hasattr(record, 'is_active') and not record.is_ctive:
+            if hasattr(record, 'is_active') and not record.is_active:
                 record.update_record(is_active=True)
             id = record.id
         else: