Merge lp:~roadmr/canonical-identity-provider/invalidatedemailaddress_created_at into lp:canonical-identity-provider/release

[Daniel Manrique]

Set InvalidatedEmailAddress date_created by default to now() so they can be created via the admin.

Set InvalidatedEmailAddress date_created by default to now() so they can be created via the admin.

All tests (except the model-level tests I updated) pass, though it may be worth checking the user-level behavior of clicking on an invalidation link still works. I'd be surprised if that wasn't covered by tests but surprises do happen.

[Maximiliano Bertacchini (maxiberta)]

LGTM.

review: Approve

=== added file 'src/identityprovider/migrations/0012_auto_20180509_2122.py'
--- src/identityprovider/migrations/0012_auto_20180509_2122.py	1970-01-01 00:00:00 +0000
+++ src/identityprovider/migrations/0012_auto_20180509_2122.py	2018-05-11 17:19:00 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2018-05-09 21:22
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('identityprovider', '0011_remove_openidrpconfig_ga_snippet'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='invalidatedemailaddress',
+            name='date_created',
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now, editable=False),
+        ),
+    ]

=== modified file 'src/identityprovider/models/emailaddress.py'
--- src/identityprovider/models/emailaddress.py	2018-02-14 14:05:59 +0000
+++ src/identityprovider/models/emailaddress.py	2018-05-11 17:19:00 +0000
@@ -92,7 +92,8 @@
 
 class InvalidatedEmailAddress(models.Model):
     email = models.TextField(validators=[validate_email])
-    date_created = models.DateTimeField(blank=True, editable=False)
+    date_created = models.DateTimeField(
+        default=now, blank=True, editable=False)
     date_invalidated = models.DateTimeField(default=now, null=True, blank=True)
     account = models.ForeignKey(
         Account, db_column=b'account', blank=True, null=True)

=== modified file 'src/identityprovider/tests/test_admin.py'
--- src/identityprovider/tests/test_admin.py	2018-02-15 11:27:21 +0000
+++ src/identityprovider/tests/test_admin.py	2018-05-11 17:19:00 +0000
@@ -412,6 +412,25 @@
     model = InvalidatedEmailAddress
     modeladmin = InvalidatedEmailAddressAdmin
 
+    def test_add_invalidated_email(self):
+        self.admin = self.factory.make_account(
+            is_superuser=True, password="admin007")
+        assert self.client.login(
+            username=self.admin.user.email, password="admin007")
+        self.account = self.factory.make_account()
+        data = {
+                'email': "[e-mail]",
+                'date_invalidated': now(),
+                'account': self.account.id,
+        }
+        self.client.post(reverse(
+            'admin:identityprovider_invalidatedemailaddress_add'), data)
+        self.assertEqual(
+            self.account.invalidatedemailaddress_set.all().count(), 1)
+        self.assertEqual(
+            self.account.invalidatedemailaddress_set.first().email,
+            "[e-mail]")
+
 
 class ApproxCountQuerySetTestCase(SSOBaseTestCase):
     def setUp(self):

=== modified file 'src/identityprovider/tests/test_models_emailaddress.py'
--- src/identityprovider/tests/test_models_emailaddress.py	2018-02-21 16:15:06 +0000
+++ src/identityprovider/tests/test_models_emailaddress.py	2018-05-11 17:19:00 +0000
@@ -3,7 +3,6 @@
 from datetime import timedelta
 
 from django.core.exceptions import ValidationError
-from django.db import IntegrityError
 from django.utils.timezone import now
 from mock import Mock, patch
 
@@ -137,36 +136,30 @@
 
 class InvalidatedEmailAddressTestCase(SSOBaseTestCase):
 
-    def test_date_created_not_default(self):
-        self.assertRaises(
-            IntegrityError,
-            InvalidatedEmailAddress.objects.create, email='[e-mail]')
-
     def test_email_valid(self):
         for valid in ('[e-mail]', '[e-mail]', '[e-mail]'):
             email = InvalidatedEmailAddress.objects.create(
-                email=valid, date_created=now())
+                email=valid)
             email.full_clean()  # no failure
 
     def test_email_invalid(self):
         for invalid in ('', '.', '@', '@foo', '@foo.x', 'a@foo.x', 'foo@bar',
                         'a@@a.com'):
             email = InvalidatedEmailAddress.objects.create(
-                email=invalid, date_created=now())
+                email=invalid)
             self.assertRaises(
                 ValidationError, email.full_clean)
 
     def test_unicode(self):
         email = u'zaraza♥[e-mail]'
         invalid = InvalidatedEmailAddress.objects.create(
-            email=email, date_created=now())
+            email=email)
         self.assertEqual(email, unicode(invalid))
 
     def test_date_invalidated(self):
         some_date = now() + timedelta(days=30)
         invalid = InvalidatedEmailAddress.objects.create(
-            email='[e-mail]', date_created=now(),
-            date_invalidated=some_date)
+            email='[e-mail]', date_invalidated=some_date)
 
         self.assertEqual(invalid.date_invalidated, some_date)
 
@@ -176,11 +169,11 @@
         InvalidatedEmailAddress._meta.get_field(
             'date_invalidated').get_default = mock_date
         invalid = InvalidatedEmailAddress.objects.create(
-            email='[e-mail]', date_created=now())
+            email='[e-mail]')
 
         self.assertEqual(invalid.date_invalidated, mock_date.return_value)
 
     def test_account_notified(self):
         invalid = InvalidatedEmailAddress.objects.create(
-            email='[e-mail]', date_created=now())
+            email='[e-mail]')
         self.assertFalse(invalid.account_notified)